From edd54f6b7bc0605b82c75aa54bb1fc1a7df89f0a Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Tue, 29 Jul 2025 17:09:27 -0400 Subject: [PATCH] chore: update libcosmic --- Cargo.lock | 89 +++++------------------- Cargo.toml | 10 +-- cosmic-settings/src/pages/time/region.rs | 4 +- 3 files changed, 25 insertions(+), 78 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c4d2d50..a855a97 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1517,7 +1517,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic//?rev=8c4cb2e#8c4cb2e54f73c6654bc4a8834b6cdddf8a6dd154" +source = "git+https://github.com/pop-os/libcosmic#05874e8ea252be0e6115c268aef18a19019842f4" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1539,7 +1539,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic//?rev=8c4cb2e#8c4cb2e54f73c6654bc4a8834b6cdddf8a6dd154" +source = "git+https://github.com/pop-os/libcosmic#05874e8ea252be0e6115c268aef18a19019842f4" dependencies = [ "quote", "syn 2.0.104", @@ -1869,7 +1869,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic//?rev=8c4cb2e#8c4cb2e54f73c6654bc4a8834b6cdddf8a6dd154" +source = "git+https://github.com/pop-os/libcosmic#05874e8ea252be0e6115c268aef18a19019842f4" dependencies = [ "almost", "cosmic-config", @@ -3246,7 +3246,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.61.2", + "windows-core 0.57.0", ] [[package]] @@ -3261,7 +3261,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic//?rev=8c4cb2e#8c4cb2e54f73c6654bc4a8834b6cdddf8a6dd154" +source = "git+https://github.com/pop-os/libcosmic#05874e8ea252be0e6115c268aef18a19019842f4" dependencies = [ "dnd", "iced_accessibility", @@ -3279,7 +3279,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic//?rev=8c4cb2e#8c4cb2e54f73c6654bc4a8834b6cdddf8a6dd154" +source = "git+https://github.com/pop-os/libcosmic#05874e8ea252be0e6115c268aef18a19019842f4" dependencies = [ "accesskit", "accesskit_winit", @@ -3288,7 +3288,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic//?rev=8c4cb2e#8c4cb2e54f73c6654bc4a8834b6cdddf8a6dd154" +source = "git+https://github.com/pop-os/libcosmic#05874e8ea252be0e6115c268aef18a19019842f4" dependencies = [ "bitflags 2.9.1", "bytes", @@ -3313,7 +3313,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic//?rev=8c4cb2e#8c4cb2e54f73c6654bc4a8834b6cdddf8a6dd154" +source = "git+https://github.com/pop-os/libcosmic#05874e8ea252be0e6115c268aef18a19019842f4" dependencies = [ "futures", "iced_core", @@ -3339,7 +3339,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic//?rev=8c4cb2e#8c4cb2e54f73c6654bc4a8834b6cdddf8a6dd154" +source = "git+https://github.com/pop-os/libcosmic#05874e8ea252be0e6115c268aef18a19019842f4" dependencies = [ "bitflags 2.9.1", "bytemuck", @@ -3361,7 +3361,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic//?rev=8c4cb2e#8c4cb2e54f73c6654bc4a8834b6cdddf8a6dd154" +source = "git+https://github.com/pop-os/libcosmic#05874e8ea252be0e6115c268aef18a19019842f4" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3373,7 +3373,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic//?rev=8c4cb2e#8c4cb2e54f73c6654bc4a8834b6cdddf8a6dd154" +source = "git+https://github.com/pop-os/libcosmic#05874e8ea252be0e6115c268aef18a19019842f4" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -3389,7 +3389,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic//?rev=8c4cb2e#8c4cb2e54f73c6654bc4a8834b6cdddf8a6dd154" +source = "git+https://github.com/pop-os/libcosmic#05874e8ea252be0e6115c268aef18a19019842f4" dependencies = [ "bytemuck", "cosmic-text", @@ -3405,7 +3405,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic//?rev=8c4cb2e#8c4cb2e54f73c6654bc4a8834b6cdddf8a6dd154" +source = "git+https://github.com/pop-os/libcosmic#05874e8ea252be0e6115c268aef18a19019842f4" dependencies = [ "as-raw-xcb-connection", "bitflags 2.9.1", @@ -3436,7 +3436,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic//?rev=8c4cb2e#8c4cb2e54f73c6654bc4a8834b6cdddf8a6dd154" +source = "git+https://github.com/pop-os/libcosmic#05874e8ea252be0e6115c268aef18a19019842f4" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3456,7 +3456,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic//?rev=8c4cb2e#8c4cb2e54f73c6654bc4a8834b6cdddf8a6dd154" +source = "git+https://github.com/pop-os/libcosmic#05874e8ea252be0e6115c268aef18a19019842f4" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -4581,7 +4581,7 @@ checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic//?rev=8c4cb2e#8c4cb2e54f73c6654bc4a8834b6cdddf8a6dd154" +source = "git+https://github.com/pop-os/libcosmic#05874e8ea252be0e6115c268aef18a19019842f4" dependencies = [ "apply", "ashpd 0.11.0", @@ -8524,7 +8524,7 @@ version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ - "windows-result 0.1.2", + "windows-result", "windows-targets 0.52.6", ] @@ -8536,23 +8536,10 @@ checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" dependencies = [ "windows-implement 0.57.0", "windows-interface 0.57.0", - "windows-result 0.1.2", + "windows-result", "windows-targets 0.52.6", ] -[[package]] -name = "windows-core" -version = "0.61.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" -dependencies = [ - "windows-implement 0.60.0", - "windows-interface 0.59.1", - "windows-link", - "windows-result 0.3.4", - "windows-strings", -] - [[package]] name = "windows-implement" version = "0.53.0" @@ -8575,17 +8562,6 @@ dependencies = [ "syn 2.0.104", ] -[[package]] -name = "windows-implement" -version = "0.60.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] - [[package]] name = "windows-interface" version = "0.53.0" @@ -8608,17 +8584,6 @@ dependencies = [ "syn 2.0.104", ] -[[package]] -name = "windows-interface" -version = "0.59.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] - [[package]] name = "windows-link" version = "0.1.3" @@ -8634,24 +8599,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-result" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" -dependencies = [ - "windows-link", -] - -[[package]] -name = "windows-strings" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" -dependencies = [ - "windows-link", -] - [[package]] name = "windows-sys" version = "0.45.0" diff --git a/Cargo.toml b/Cargo.toml index a6ea55f..f993fbe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -68,11 +68,11 @@ cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", # cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon//", branch = "input_nobuild" } # For development and testing purposes -[patch.'https://github.com/pop-os/libcosmic'] -libcosmic = { git = "https://github.com/pop-os/libcosmic//", rev = "8c4cb2e" } -cosmic-config = { git = "https://github.com/pop-os/libcosmic//", rev = "8c4cb2e" } -cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", rev = "8c4cb2e" } -iced_futures = { git = "https://github.com/pop-os/libcosmic//", rev = "8c4cb2e" } +# [patch.'https://github.com/pop-os/libcosmic'] +# libcosmic = { git = "https://github.com/pop-os/libcosmic//", rev = "8c4cb2e" } +# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", rev = "8c4cb2e" } +# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", rev = "8c4cb2e" } +# iced_futures = { git = "https://github.com/pop-os/libcosmic//", rev = "8c4cb2e" } # libcosmic = { path = "../libcosmic" } # cosmic-config = { path = "../libcosmic/cosmic-config" } # cosmic-theme = { path = "../libcosmic/cosmic-theme" } diff --git a/cosmic-settings/src/pages/time/region.rs b/cosmic-settings/src/pages/time/region.rs index 00fdbf5..945f7cb 100644 --- a/cosmic-settings/src/pages/time/region.rs +++ b/cosmic-settings/src/pages/time/region.rs @@ -347,7 +347,7 @@ impl Page { let search_input = &self.add_language_search.trim().to_lowercase(); let svg_accent = Rc::new(|theme: &cosmic::Theme| { - let color = theme.cosmic().accent_color().into(); + let color = theme.cosmic().accent_text_color().into(); cosmic::widget::svg::Style { color: Some(color) } }); @@ -513,7 +513,7 @@ impl Page { fn region_view(&self) -> cosmic::Element<'_, crate::pages::Message> { let svg_accent = Rc::new(|theme: &cosmic::Theme| { - let color = theme.cosmic().accent_color().into(); + let color = theme.cosmic().accent_text_color().into(); cosmic::widget::svg::Style { color: Some(color) } });