leyoda/cosmic-edit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependencies and fix warning

Browse source
This commit is contained in:
Jeremy Soller 2023-11-17 08:31:43 -07:00
parent 125483ce04
commit 983e85ab89
No known key found for this signature in database
GPG key ID: DCFCA852D3906975
3 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

45
Cargo.lock generated
View file

@ -834,7 +834,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config" name = "cosmic-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d"
dependencies = [ dependencies = [
"atomicwrites", "atomicwrites",
"cosmic-config-derive", "cosmic-config-derive",
@ -848,7 +848,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config-derive" name = "cosmic-config-derive"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d"
dependencies = [ dependencies = [
"quote", "quote",
"syn 1.0.109", "syn 1.0.109",
@ -897,7 +897,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-text" name = "cosmic-text"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/pop-os/cosmic-text?branch=vi-editor#7d21045b2f93a382f7ddea209b8f28204888d418" source = "git+https://github.com/pop-os/cosmic-text#9a975ad79ad82a21be73b2ef1a6288bb351c76cf"
dependencies = [ dependencies = [
"cosmic_undo_2", "cosmic_undo_2",
"fontdb 0.16.0", "fontdb 0.16.0",
@ -920,7 +920,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-theme" name = "cosmic-theme"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d"
dependencies = [ dependencies = [
"almost", "almost",
"cosmic-config", "cosmic-config",
@ -1334,9 +1334,9 @@ dependencies = [
[[package]] [[package]]
name = "etagere" name = "etagere"
version = "0.2.8" version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcf22f748754352918e082e0039335ee92454a5d62bcaf69b5e8daf5907d9644" checksum = "306960881d6c46bd0dd6b7f07442a441418c08d0d3e63d8d080b0f64c6343e4e"
dependencies = [ dependencies = [
"euclid", "euclid",
"svg_fmt", "svg_fmt",
@ -2165,7 +2165,7 @@ dependencies = [
[[package]] [[package]]
name = "iced" name = "iced"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d"
dependencies = [ dependencies = [
"iced_accessibility", "iced_accessibility",
"iced_core", "iced_core",
@ -2180,7 +2180,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_accessibility" name = "iced_accessibility"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"accesskit_winit", "accesskit_winit",
@ -2189,7 +2189,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_core" name = "iced_core"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"instant", "instant",
@ -2203,7 +2203,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_futures" name = "iced_futures"
version = "0.7.0" version = "0.7.0"
source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d"
dependencies = [ dependencies = [
"futures", "futures",
"iced_core", "iced_core",
@ -2215,7 +2215,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_graphics" name = "iced_graphics"
version = "0.9.0" version = "0.9.0"
source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"bytemuck", "bytemuck",
@ -2233,7 +2233,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_renderer" name = "iced_renderer"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d"
dependencies = [ dependencies = [
"iced_graphics", "iced_graphics",
"iced_tiny_skia", "iced_tiny_skia",
@ -2246,7 +2246,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_runtime" name = "iced_runtime"
version = "0.1.1" version = "0.1.1"
source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d"
dependencies = [ dependencies = [
"iced_core", "iced_core",
"iced_futures", "iced_futures",
@ -2256,7 +2256,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_style" name = "iced_style"
version = "0.9.0" version = "0.9.0"
source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d"
dependencies = [ dependencies = [
"iced_core", "iced_core",
"once_cell", "once_cell",
@ -2266,7 +2266,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_tiny_skia" name = "iced_tiny_skia"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"cosmic-text 0.9.0", "cosmic-text 0.9.0",
@ -2284,7 +2284,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_wgpu" name = "iced_wgpu"
version = "0.11.1" version = "0.11.1"
source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"bytemuck", "bytemuck",
@ -2306,7 +2306,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_widget" name = "iced_widget"
version = "0.1.3" version = "0.1.3"
source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d"
dependencies = [ dependencies = [
"iced_renderer", "iced_renderer",
"iced_runtime", "iced_runtime",
@ -2320,7 +2320,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_winit" name = "iced_winit"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d"
dependencies = [ dependencies = [
"iced_graphics", "iced_graphics",
"iced_runtime", "iced_runtime",
@ -2577,7 +2577,7 @@ checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
[[package]] [[package]]
name = "libcosmic" name = "libcosmic"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d"
dependencies = [ dependencies = [
"apply", "apply",
"cosmic-config", "cosmic-config",
@ -2910,7 +2910,8 @@ dependencies = [
[[package]] [[package]]
name = "modit" name = "modit"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/modit.git#1e0b93734e215896822d8b81a1ea2a55ef835dc4" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33c9a234e73283ae1882428b19b1893aefc946a185f4e636d8fbace35299ceb1"
dependencies = [ dependencies = [
"log", "log",
] ]
@ -4657,9 +4658,9 @@ dependencies = [
[[package]] [[package]]
name = "tinystr" name = "tinystr"
version = "0.7.4" version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece"
dependencies = [ dependencies = [
"displaydoc", "displaydoc",
] ]

1
Cargo.toml
View file

@ -22,7 +22,6 @@ rust-embed = "6.3.0"
[dependencies.cosmic-text] [dependencies.cosmic-text]
git = "https://github.com/pop-os/cosmic-text" git = "https://github.com/pop-os/cosmic-text"
branch = "vi-editor"
features = ["syntect", "vi"] features = ["syntect", "vi"]
#path = "../cosmic-text" #path = "../cosmic-text"

2
src/text_box.rs
View file

@ -344,7 +344,7 @@ where
let start_line = start_line_opt.unwrap_or(end_line); let start_line = start_line_opt.unwrap_or(end_line);
let lines = editor.buffer().lines.len(); let lines = editor.buffer().lines.len();
let start_y = (start_line * image_h as usize) / lines; let start_y = (start_line * image_h as usize) / lines;
let end_y = (((end_line + 1) * image_h as usize) / lines); let end_y = ((end_line + 1) * image_h as usize) / lines;
let rect = Rectangle::new( let rect = Rectangle::new(
[image_w as f32 / scale_factor, start_y as f32 / scale_factor].into(), [image_w as f32 / scale_factor, start_y as f32 / scale_factor].into(),