diff --git a/Cargo.lock b/Cargo.lock index eb125a2..b24599d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -640,9 +640,9 @@ dependencies = [ [[package]] name = "avif-serialize" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98922d6a4cfbcb08820c69d8eeccc05bb1f29bfa06b4f5b1dbfe9a868bd7608e" +checksum = "19135c0c7a60bfee564dbe44ab5ce0557c6bf3884e5291a50be76a15640c4fbd" dependencies = [ "arrayvec", ] @@ -789,9 +789,9 @@ checksum = "56ed6191a7e78c36abdb16ab65341eefd73d64d303fffccdbb00d51e4205967b" [[package]] name = "bumpalo" -version = "3.18.1" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "by_address" @@ -1397,7 +1397,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#a85b3693994ef2b8275eca6a9eccc86a2d7e9f86" +source = "git+https://github.com/pop-os/libcosmic.git#dfdca0ef81985d260d584f1e4f7a6c1473678356" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1416,7 +1416,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#a85b3693994ef2b8275eca6a9eccc86a2d7e9f86" +source = "git+https://github.com/pop-os/libcosmic.git#dfdca0ef81985d260d584f1e4f7a6c1473678356" dependencies = [ "quote", "syn 2.0.104", @@ -1425,7 +1425,7 @@ dependencies = [ [[package]] name = "cosmic-files" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-files.git#cefa82f4e94063626f413226e7071fddf657e57c" +source = "git+https://github.com/pop-os/cosmic-files.git#e3b7cfc8e6050a2655bbe80f0f98c056e11e66e7" dependencies = [ "chrono", "compio", @@ -1556,7 +1556,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#a85b3693994ef2b8275eca6a9eccc86a2d7e9f86" +source = "git+https://github.com/pop-os/libcosmic.git#dfdca0ef81985d260d584f1e4f7a6c1473678356" dependencies = [ "almost", "cosmic-config", @@ -1648,9 +1648,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "crypto-common" @@ -2935,7 +2935,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#a85b3693994ef2b8275eca6a9eccc86a2d7e9f86" +source = "git+https://github.com/pop-os/libcosmic.git#dfdca0ef81985d260d584f1e4f7a6c1473678356" dependencies = [ "dnd", "iced_accessibility", @@ -2953,7 +2953,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#a85b3693994ef2b8275eca6a9eccc86a2d7e9f86" +source = "git+https://github.com/pop-os/libcosmic.git#dfdca0ef81985d260d584f1e4f7a6c1473678356" dependencies = [ "accesskit", "accesskit_winit", @@ -2962,7 +2962,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#a85b3693994ef2b8275eca6a9eccc86a2d7e9f86" +source = "git+https://github.com/pop-os/libcosmic.git#dfdca0ef81985d260d584f1e4f7a6c1473678356" dependencies = [ "bitflags 2.9.1", "bytes", @@ -2987,7 +2987,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#a85b3693994ef2b8275eca6a9eccc86a2d7e9f86" +source = "git+https://github.com/pop-os/libcosmic.git#dfdca0ef81985d260d584f1e4f7a6c1473678356" dependencies = [ "futures", "iced_core", @@ -3013,7 +3013,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#a85b3693994ef2b8275eca6a9eccc86a2d7e9f86" +source = "git+https://github.com/pop-os/libcosmic.git#dfdca0ef81985d260d584f1e4f7a6c1473678356" dependencies = [ "bitflags 2.9.1", "bytemuck", @@ -3035,7 +3035,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#a85b3693994ef2b8275eca6a9eccc86a2d7e9f86" +source = "git+https://github.com/pop-os/libcosmic.git#dfdca0ef81985d260d584f1e4f7a6c1473678356" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3047,7 +3047,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#a85b3693994ef2b8275eca6a9eccc86a2d7e9f86" +source = "git+https://github.com/pop-os/libcosmic.git#dfdca0ef81985d260d584f1e4f7a6c1473678356" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -3063,7 +3063,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#a85b3693994ef2b8275eca6a9eccc86a2d7e9f86" +source = "git+https://github.com/pop-os/libcosmic.git#dfdca0ef81985d260d584f1e4f7a6c1473678356" dependencies = [ "bytemuck", "cosmic-text", @@ -3079,7 +3079,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#a85b3693994ef2b8275eca6a9eccc86a2d7e9f86" +source = "git+https://github.com/pop-os/libcosmic.git#dfdca0ef81985d260d584f1e4f7a6c1473678356" dependencies = [ "as-raw-xcb-connection", "bitflags 2.9.1", @@ -3110,7 +3110,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#a85b3693994ef2b8275eca6a9eccc86a2d7e9f86" +source = "git+https://github.com/pop-os/libcosmic.git#dfdca0ef81985d260d584f1e4f7a6c1473678356" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3130,7 +3130,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#a85b3693994ef2b8275eca6a9eccc86a2d7e9f86" +source = "git+https://github.com/pop-os/libcosmic.git#dfdca0ef81985d260d584f1e4f7a6c1473678356" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3736,9 +3736,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" dependencies = [ "equivalent", "hashbrown", @@ -4069,7 +4069,7 @@ checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#a85b3693994ef2b8275eca6a9eccc86a2d7e9f86" +source = "git+https://github.com/pop-os/libcosmic.git#dfdca0ef81985d260d584f1e4f7a6c1473678356" dependencies = [ "apply", "ashpd", @@ -4136,9 +4136,9 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "libredox" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +checksum = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638" dependencies = [ "bitflags 2.9.1", "libc", @@ -8210,9 +8210,9 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xattr" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e" +checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909" dependencies = [ "libc", "rustix 1.0.7", @@ -8220,9 +8220,9 @@ dependencies = [ [[package]] name = "xcursor" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "635887f4315a33cb714eb059bdbd7c1c92bfa71bc5b9d5115460502f788c2ab5" +checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b" [[package]] name = "xdg" diff --git a/src/main.rs b/src/main.rs index 5a9f997..c6f6306 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2866,8 +2866,6 @@ impl Application for App { fn subscription(&self) -> Subscription { struct ConfigSubscription; struct TerminalEventSubscription; - struct ThemeSubscription; - struct ThemeModeSubscription; Subscription::batch([ event::listen_with(|event, _status, _window_id| match event { diff --git a/src/menu.rs b/src/menu.rs index 0d1e445..e58299e 100644 --- a/src/menu.rs +++ b/src/menu.rs @@ -1,17 +1,19 @@ // SPDX-License-Identifier: GPL-3.0-only use cosmic::widget::menu::key_bind::KeyBind; -use cosmic::widget::menu::{items as menu_items, menu_button, root as menu_root, Item as MenuItem}; +use cosmic::widget::menu::{menu_button, Item as MenuItem}; use cosmic::{ app::Core, iced::{ + advanced::widget::text::Style as TextStyle, widget::{column, horizontal_space}, Background, Length, }, iced_core::Border, + theme, widget::{ self, divider, - menu::{ItemHeight, ItemWidth, MenuBar, Tree as MenuTree}, + menu::{ItemHeight, ItemWidth}, responsive_menu_bar, segmented_button, }, Element, @@ -36,13 +38,22 @@ pub fn context_menu<'a>( } String::new() }; + fn key_style(theme: &cosmic::Theme) -> TextStyle { + let mut color = theme.cosmic().background.component.on; + color.alpha *= 0.75; + TextStyle { + color: Some(color.into()), + } + } let menu_item = |label, action| { let key = find_key(&action); menu_button(vec![ widget::text(label).into(), horizontal_space().into(), - widget::text(key).into(), + widget::text(key) + .class(theme::Text::Custom(key_style)) + .into(), ]) .on_press(Message::TabContextAction(entity, action)) };