From 983e85ab8945581b4f2240dda1786c16271b68e7 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 17 Nov 2023 08:31:43 -0700 Subject: [PATCH] Update dependencies and fix warning --- Cargo.lock | 45 +++++++++++++++++++++++---------------------- Cargo.toml | 1 - src/text_box.rs | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1e7875c..fe519bc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -834,7 +834,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" +source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -848,7 +848,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" +source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d" dependencies = [ "quote", "syn 1.0.109", @@ -897,7 +897,7 @@ dependencies = [ [[package]] name = "cosmic-text" 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 = [ "cosmic_undo_2", "fontdb 0.16.0", @@ -920,7 +920,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" +source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d" dependencies = [ "almost", "cosmic-config", @@ -1334,9 +1334,9 @@ dependencies = [ [[package]] name = "etagere" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf22f748754352918e082e0039335ee92454a5d62bcaf69b5e8daf5907d9644" +checksum = "306960881d6c46bd0dd6b7f07442a441418c08d0d3e63d8d080b0f64c6343e4e" dependencies = [ "euclid", "svg_fmt", @@ -2165,7 +2165,7 @@ dependencies = [ [[package]] name = "iced" version = "0.10.0" -source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" +source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d" dependencies = [ "iced_accessibility", "iced_core", @@ -2180,7 +2180,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" +source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d" dependencies = [ "accesskit", "accesskit_winit", @@ -2189,7 +2189,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.10.0" -source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" +source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d" dependencies = [ "bitflags 1.3.2", "instant", @@ -2203,7 +2203,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.7.0" -source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" +source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d" dependencies = [ "futures", "iced_core", @@ -2215,7 +2215,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.9.0" -source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" +source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2233,7 +2233,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" +source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2246,7 +2246,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.1.1" -source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" +source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d" dependencies = [ "iced_core", "iced_futures", @@ -2256,7 +2256,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.9.0" -source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" +source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d" dependencies = [ "iced_core", "once_cell", @@ -2266,7 +2266,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" +source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d" dependencies = [ "bytemuck", "cosmic-text 0.9.0", @@ -2284,7 +2284,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.11.1" -source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" +source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2306,7 +2306,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.1.3" -source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" +source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d" dependencies = [ "iced_renderer", "iced_runtime", @@ -2320,7 +2320,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.10.0" -source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" +source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d" dependencies = [ "iced_graphics", "iced_runtime", @@ -2577,7 +2577,7 @@ checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" +source = "git+https://github.com/pop-os/libcosmic#1caae11e8f11a1e838e950b7e25050f6428be63d" dependencies = [ "apply", "cosmic-config", @@ -2910,7 +2910,8 @@ dependencies = [ [[package]] name = "modit" 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 = [ "log", ] @@ -4657,9 +4658,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" +checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" dependencies = [ "displaydoc", ] diff --git a/Cargo.toml b/Cargo.toml index 4960e3b..c593cfc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,6 @@ rust-embed = "6.3.0" [dependencies.cosmic-text] git = "https://github.com/pop-os/cosmic-text" -branch = "vi-editor" features = ["syntect", "vi"] #path = "../cosmic-text" diff --git a/src/text_box.rs b/src/text_box.rs index 3f50620..e4cb730 100644 --- a/src/text_box.rs +++ b/src/text_box.rs @@ -344,7 +344,7 @@ where let start_line = start_line_opt.unwrap_or(end_line); let lines = editor.buffer().lines.len(); 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( [image_w as f32 / scale_factor, start_y as f32 / scale_factor].into(),