From 5c68b550678601a9646e0c44e617069ee16db348 Mon Sep 17 00:00:00 2001 From: pml68 Date: Wed, 26 Feb 2025 23:23:52 +0100 Subject: feat: switch to personal `iced` fork, work on version info --- src/panes/code_view.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/panes/code_view.rs') diff --git a/src/panes/code_view.rs b/src/panes/code_view.rs index e133078..89d17e8 100644 --- a/src/panes/code_view.rs +++ b/src/panes/code_view.rs @@ -20,7 +20,6 @@ fn highlight_style(theme: &Theme, scope: &Scope) -> Format { pub fn view( editor_content: &text_editor::Content, - theme: Theme, is_focused: bool, ) -> pane_grid::Content<'_, Message> { let title = row![ @@ -46,8 +45,9 @@ pub fn view( text_editor(editor_content) .on_action(Message::EditorAction) .font(Font::MONOSPACE) + .rehighlight_on_redraw(true) .highlight_with::( - Settings::new(vec![], highlight_style, theme, "rs"), + Settings::new(vec![], highlight_style, "rs"), Highlight::to_format, ) .style(|theme, _| { -- cgit v1.2.3 From 9454c42d9d2352ebb8037761ba5bbc1ea12f5da1 Mon Sep 17 00:00:00 2001 From: pml68 Date: Thu, 27 Feb 2025 15:27:12 +0100 Subject: feat: update `iced` --- Cargo.lock | 71 +++++++++++++++++++++++++------------------------- Cargo.toml | 2 +- src/panes/code_view.rs | 1 - 3 files changed, 36 insertions(+), 38 deletions(-) (limited to 'src/panes/code_view.rs') diff --git a/Cargo.lock b/Cargo.lock index 190197a..26a20ef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -430,9 +430,9 @@ dependencies = [ [[package]] name = "avif-serialize" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e335041290c43101ca215eed6f43ec437eb5a42125573f600fc3fa42b9bddd62" +checksum = "98922d6a4cfbcb08820c69d8eeccc05bb1f29bfa06b4f5b1dbfe9a868bd7608e" dependencies = [ "arrayvec", ] @@ -601,12 +601,11 @@ checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" [[package]] name = "bzip2" -version = "0.4.4" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +checksum = "75b89e7c29231c673a61a46e722602bcd138298f6b9e81e71119693534585f5c" dependencies = [ "bzip2-sys", - "libc", ] [[package]] @@ -1139,9 +1138,9 @@ dependencies = [ [[package]] name = "either" -version = "1.13.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "b7914353092ddf589ad78f25c5c1c21b7f80b0ff8621e7c814c3485b5306da9d" [[package]] name = "embed-resource" @@ -1313,9 +1312,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.35" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc" dependencies = [ "crc32fast", "miniz_oxide", @@ -2004,7 +2003,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?rev=d49a70eaea0803b9a4843b37e870f44b652ed6df#d49a70eaea0803b9a4843b37e870f44b652ed6df" +source = "git+https://github.com/pml68/iced?rev=3a491669e7fecf21c261de63dcb1e8069063648f#3a491669e7fecf21c261de63dcb1e8069063648f" dependencies = [ "iced_core", "iced_futures", @@ -2018,7 +2017,7 @@ dependencies = [ [[package]] name = "iced_anim" version = "0.2.0" -source = "git+https://github.com/pml68/iced_anim#3836cb0c0afdc2dd4f477e5ef51d3592c53cda22" +source = "git+https://github.com/pml68/iced_anim#8b50869a7a26145f687259d1dd6222ef69487001" dependencies = [ "iced", "iced_anim_derive", @@ -2027,7 +2026,7 @@ dependencies = [ [[package]] name = "iced_anim_derive" version = "0.2.0" -source = "git+https://github.com/pml68/iced_anim#3836cb0c0afdc2dd4f477e5ef51d3592c53cda22" +source = "git+https://github.com/pml68/iced_anim#8b50869a7a26145f687259d1dd6222ef69487001" dependencies = [ "quote", "syn", @@ -2060,7 +2059,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?rev=d49a70eaea0803b9a4843b37e870f44b652ed6df#d49a70eaea0803b9a4843b37e870f44b652ed6df" +source = "git+https://github.com/pml68/iced?rev=3a491669e7fecf21c261de63dcb1e8069063648f#3a491669e7fecf21c261de63dcb1e8069063648f" dependencies = [ "bitflags 2.8.0", "bytes", @@ -2079,7 +2078,7 @@ dependencies = [ [[package]] name = "iced_custom_highlighter" version = "0.1.0" -source = "git+https://github.com/pml68/iced_custom_highlighter?branch=master#5eb99c163dc765809885101529d7790a4f705b52" +source = "git+https://github.com/pml68/iced_custom_highlighter?branch=master#e4708bdb31a792918a4bc162aebbc296fce9ce85" dependencies = [ "iced_core", "syntect", @@ -2109,7 +2108,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?rev=d49a70eaea0803b9a4843b37e870f44b652ed6df#d49a70eaea0803b9a4843b37e870f44b652ed6df" +source = "git+https://github.com/pml68/iced?rev=3a491669e7fecf21c261de63dcb1e8069063648f#3a491669e7fecf21c261de63dcb1e8069063648f" dependencies = [ "futures", "iced_core", @@ -2123,7 +2122,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?rev=d49a70eaea0803b9a4843b37e870f44b652ed6df#d49a70eaea0803b9a4843b37e870f44b652ed6df" +source = "git+https://github.com/pml68/iced?rev=3a491669e7fecf21c261de63dcb1e8069063648f#3a491669e7fecf21c261de63dcb1e8069063648f" dependencies = [ "bitflags 2.8.0", "bytemuck", @@ -2143,7 +2142,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?rev=d49a70eaea0803b9a4843b37e870f44b652ed6df#d49a70eaea0803b9a4843b37e870f44b652ed6df" +source = "git+https://github.com/pml68/iced?rev=3a491669e7fecf21c261de63dcb1e8069063648f#3a491669e7fecf21c261de63dcb1e8069063648f" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2155,7 +2154,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?rev=d49a70eaea0803b9a4843b37e870f44b652ed6df#d49a70eaea0803b9a4843b37e870f44b652ed6df" +source = "git+https://github.com/pml68/iced?rev=3a491669e7fecf21c261de63dcb1e8069063648f#3a491669e7fecf21c261de63dcb1e8069063648f" dependencies = [ "bytes", "iced_core", @@ -2168,7 +2167,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?rev=d49a70eaea0803b9a4843b37e870f44b652ed6df#d49a70eaea0803b9a4843b37e870f44b652ed6df" +source = "git+https://github.com/pml68/iced?rev=3a491669e7fecf21c261de63dcb1e8069063648f#3a491669e7fecf21c261de63dcb1e8069063648f" dependencies = [ "bytemuck", "cosmic-text", @@ -2184,7 +2183,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?rev=d49a70eaea0803b9a4843b37e870f44b652ed6df#d49a70eaea0803b9a4843b37e870f44b652ed6df" +source = "git+https://github.com/pml68/iced?rev=3a491669e7fecf21c261de63dcb1e8069063648f#3a491669e7fecf21c261de63dcb1e8069063648f" dependencies = [ "bitflags 2.8.0", "bytemuck", @@ -2203,7 +2202,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?rev=d49a70eaea0803b9a4843b37e870f44b652ed6df#d49a70eaea0803b9a4843b37e870f44b652ed6df" +source = "git+https://github.com/pml68/iced?rev=3a491669e7fecf21c261de63dcb1e8069063648f#3a491669e7fecf21c261de63dcb1e8069063648f" dependencies = [ "iced_renderer", "iced_runtime", @@ -2217,7 +2216,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?rev=d49a70eaea0803b9a4843b37e870f44b652ed6df#d49a70eaea0803b9a4843b37e870f44b652ed6df" +source = "git+https://github.com/pml68/iced?rev=3a491669e7fecf21c261de63dcb1e8069063648f#3a491669e7fecf21c261de63dcb1e8069063648f" dependencies = [ "iced_futures", "iced_graphics", @@ -2577,9 +2576,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.169" +version = "0.2.170" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828" [[package]] name = "libfuzzer-sys" @@ -2641,9 +2640,9 @@ checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7" [[package]] name = "litemap" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" +checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" [[package]] name = "litrs" @@ -2783,9 +2782,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b" +checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5" dependencies = [ "adler2", "simd-adler32", @@ -3898,9 +3897,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.9" +version = "0.17.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e75ec5e92c4d8aede845126adc388046234541629e76029599ed35a003c7ed24" +checksum = "da5349ae27d3887ca812fb375b45a4fbb36d8d12d2df394968cd86e35683fe73" dependencies = [ "cc", "cfg-if", @@ -6070,18 +6069,18 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", @@ -6133,9 +6132,9 @@ dependencies = [ [[package]] name = "zip" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9c1ea7b3a5e1f4b922ff856a129881167511563dc219869afe3787fc0c1a45" +checksum = "b280484c454e74e5fff658bbf7df8fdbe7a07c6b2de4a53def232c15ef138f3a" dependencies = [ "aes", "arbitrary", diff --git a/Cargo.toml b/Cargo.toml index 097fcd2..6dbfc30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ dirs-next = "2.0.0" [workspace.dependencies.iced] git = "https://github.com/pml68/iced" -rev = "d49a70eaea0803b9a4843b37e870f44b652ed6df" +rev = "3a491669e7fecf21c261de63dcb1e8069063648f" features = ["image", "svg", "advanced", "tokio"] [build-dependencies] diff --git a/src/panes/code_view.rs b/src/panes/code_view.rs index 89d17e8..551347c 100644 --- a/src/panes/code_view.rs +++ b/src/panes/code_view.rs @@ -45,7 +45,6 @@ pub fn view( text_editor(editor_content) .on_action(Message::EditorAction) .font(Font::MONOSPACE) - .rehighlight_on_redraw(true) .highlight_with::( Settings::new(vec![], highlight_style, "rs"), Highlight::to_format, -- cgit v1.2.3