From 4b289352f98f79b3368dbc0532cc2c9a96a599c1 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Wed, 13 Dec 2023 13:52:37 -0500 Subject: [PATCH 1/3] fix: corner radii --- Cargo.lock | 176 ++++++++++++++++++-------------- cosmic-app-list/src/app.rs | 19 ++-- cosmic-applet-power/src/main.rs | 13 ++- 3 files changed, 115 insertions(+), 93 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f7efac66..b5c4111a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -166,9 +166,9 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.5.0" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7370b58af1d7e96df3ca0f454b57e69acf9aa42ed2d7337bd206923bae0d5754" +checksum = "2c018490e423efb6f032ef575f873ea57b61d44bec763cfe027b8e8852a027cf" dependencies = [ "enumflags2", "futures-channel", @@ -329,7 +329,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -364,7 +364,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -567,7 +567,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -759,8 +759,8 @@ name = "cosmic-app-list" version = "0.1.0" dependencies = [ "anyhow", - "cosmic-client-toolkit", - "cosmic-protocols", + "cosmic-client-toolkit 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=5faec87)", + "cosmic-protocols 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=5faec87)", "freedesktop-desktop-entry", "freedesktop-icons", "futures", @@ -968,8 +968,8 @@ name = "cosmic-applet-workspaces" version = "0.1.0" dependencies = [ "anyhow", - "cosmic-client-toolkit", - "cosmic-protocols", + "cosmic-client-toolkit 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=5faec87)", + "cosmic-protocols 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=5faec87)", "futures", "i18n-embed 0.13.9", "i18n-embed-fl 0.6.7", @@ -987,7 +987,17 @@ name = "cosmic-client-toolkit" version = "0.1.0" source = "git+https://github.com/pop-os/cosmic-protocols?rev=5faec87#5faec87be0a1fd1d72e99431ac8e6647ff1dfd41" dependencies = [ - "cosmic-protocols", + "cosmic-protocols 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=5faec87)", + "smithay-client-toolkit 0.18.0", + "wayland-client 0.31.1", +] + +[[package]] +name = "cosmic-client-toolkit" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=c1b6516#c1b651630c2b71cd8dfd2eb4ab47ede9dbd63840" +dependencies = [ + "cosmic-protocols 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=c1b6516)", "smithay-client-toolkit 0.18.0", "wayland-client 0.31.1", ] @@ -995,7 +1005,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911" +source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1009,7 +1019,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911" +source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" dependencies = [ "quote", "syn 1.0.109", @@ -1018,7 +1028,7 @@ dependencies = [ [[package]] name = "cosmic-dbus-networkmanager" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#c9cb2c256eb956e0c09cb5c4409b0bb59e455b7f" +source = "git+https://github.com/pop-os/dbus-settings-bindings#2ef53b2bfae2525f45ec27065397f9c2d7cf30fe" dependencies = [ "bitflags 2.4.1", "derive_builder", @@ -1086,6 +1096,19 @@ dependencies = [ "wayland-server", ] +[[package]] +name = "cosmic-protocols" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=c1b6516#c1b651630c2b71cd8dfd2eb4ab47ede9dbd63840" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-protocols 0.31.0", + "wayland-scanner 0.31.0", + "wayland-server", +] + [[package]] name = "cosmic-text" version = "0.10.0" @@ -1110,7 +1133,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911" +source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" dependencies = [ "almost", "cosmic-config", @@ -1151,9 +1174,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "14c3242926edf34aec4ac3a77108ad4854bffaa2e4ddc1824124ce59231302d5" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1161,9 +1184,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -1172,22 +1195,21 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f" dependencies = [ "cfg-if", ] @@ -1226,12 +1248,12 @@ dependencies = [ [[package]] name = "ctor" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583" +checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" dependencies = [ "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -1316,7 +1338,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -1338,7 +1360,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -1453,7 +1475,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -1524,7 +1546,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -1618,7 +1640,7 @@ checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -1938,7 +1960,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -1958,9 +1980,9 @@ dependencies = [ [[package]] name = "fraction" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3027ae1df8d41b4bed2241c8fdad4acc1e7af60c8e17743534b545e77182d678" +checksum = "59a78dd758a47a7305478e0e054f9fde4e983b9f9eccda162bf7ca03b79e9d40" dependencies = [ "lazy_static", "num", @@ -2086,7 +2108,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -2238,7 +2260,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -2530,7 +2552,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.40", + "syn 2.0.41", "unic-langid", ] @@ -2551,7 +2573,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.40", + "syn 2.0.41", "unic-langid", ] @@ -2565,7 +2587,7 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -2594,7 +2616,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911" +source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" dependencies = [ "iced_accessibility", "iced_core", @@ -2609,7 +2631,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911" +source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" dependencies = [ "accesskit", "accesskit_unix", @@ -2618,7 +2640,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911" +source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" dependencies = [ "bitflags 1.3.2", "iced_accessibility", @@ -2636,7 +2658,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911" +source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" dependencies = [ "futures", "iced_core", @@ -2649,7 +2671,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911" +source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2672,7 +2694,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911" +source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2685,7 +2707,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911" +source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" dependencies = [ "iced_accessibility", "iced_core", @@ -2697,7 +2719,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911" +source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" dependencies = [ "enum-repr", "float-cmp", @@ -2721,7 +2743,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911" +source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" dependencies = [ "iced_core", "once_cell", @@ -2731,7 +2753,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911" +source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" dependencies = [ "bytemuck", "cosmic-text", @@ -2749,7 +2771,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911" +source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2769,7 +2791,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911" +source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" dependencies = [ "iced_renderer", "iced_runtime", @@ -3037,11 +3059,11 @@ checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911" +source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" dependencies = [ "apply", "ashpd", - "cosmic-client-toolkit", + "cosmic-client-toolkit 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=c1b6516)", "cosmic-config", "cosmic-panel-config", "cosmic-theme", @@ -3059,7 +3081,7 @@ dependencies = [ "iced_tiny_skia", "iced_widget", "lazy_static", - "nix 0.26.4", + "nix 0.27.1", "palette", "ron", "slotmap", @@ -3395,7 +3417,7 @@ dependencies = [ [[package]] name = "mpris2-zbus" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#c9cb2c256eb956e0c09cb5c4409b0bb59e455b7f" +source = "git+https://github.com/pop-os/dbus-settings-bindings#2ef53b2bfae2525f45ec27065397f9c2d7cf30fe" dependencies = [ "serde", "thiserror", @@ -3703,7 +3725,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -3733,7 +3755,7 @@ checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -3832,7 +3854,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -3867,7 +3889,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -4319,7 +4341,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils 7.8.1", - "syn 2.0.40", + "syn 2.0.41", "walkdir", ] @@ -4332,7 +4354,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils 8.1.0", - "syn 2.0.40", + "syn 2.0.41", "walkdir", ] @@ -4513,7 +4535,7 @@ checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -4535,7 +4557,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -4844,9 +4866,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.40" +version = "2.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e" +checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" dependencies = [ "proc-macro2", "quote", @@ -4949,7 +4971,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -5091,7 +5113,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -5189,7 +5211,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -5266,18 +5288,18 @@ dependencies = [ [[package]] name = "unic-langid" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "887622f8e7b723780c5e64b04dcc0c9b8f426ada7cca6790cd3ea3bf0f08037a" +checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" dependencies = [ "unic-langid-impl", ] [[package]] name = "unic-langid-impl" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5adeb847e35eed4efbffd9fb2e4d078b91ece56e4d6a3c0d2df55b3a1dac07d5" +checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" dependencies = [ "serde", "tinystr", @@ -5501,7 +5523,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", "wasm-bindgen-shared", ] @@ -5535,7 +5557,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6124,9 +6146,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.27" +version = "0.5.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb877ca3232bec99a6472ed63f7241de2a250165260908b2d24c09d867907a85" +checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2" dependencies = [ "memchr", ] @@ -6328,7 +6350,7 @@ checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] diff --git a/cosmic-app-list/src/app.rs b/cosmic-app-list/src/app.rs index 7fedfd1d..ac1d9f76 100755 --- a/cosmic-app-list/src/app.rs +++ b/cosmic-app-list/src/app.rs @@ -124,15 +124,16 @@ impl DockItem { container(vertical_space(Length::Fixed(0.0))) .padding(dot_radius) .style(::Style::Custom(Box::new( - |theme| container::Appearance { - text_color: Some(Color::TRANSPARENT), - background: Some(Background::Color( - theme.cosmic().on_bg_color().into(), - )), - border_radius: 4.0.into(), - border_width: 0.0, - border_color: Color::TRANSPARENT, - icon_color: Some(Color::TRANSPARENT), + |theme| { + let cosmic = theme.cosmic(); + container::Appearance { + text_color: Some(Color::TRANSPARENT), + background: Some(Background::Color(cosmic.on_bg_color().into())), + border_radius: cosmic.corner_radii.radius_xs.into(), + border_width: 0.0, + border_color: Color::TRANSPARENT, + icon_color: Some(Color::TRANSPARENT), + } }, ))) .into() diff --git a/cosmic-applet-power/src/main.rs b/cosmic-applet-power/src/main.rs index eb6aa7d1..4e37bcc0 100644 --- a/cosmic-applet-power/src/main.rs +++ b/cosmic-applet-power/src/main.rs @@ -317,15 +317,14 @@ impl cosmic::Application for Power { container( container(content) .style(cosmic::theme::Container::custom(|theme| { + let cosmic = theme.cosmic(); container::Appearance { - icon_color: Some(theme.cosmic().background.on.into()), - text_color: Some(theme.cosmic().background.on.into()), - background: Some( - Color::from(theme.cosmic().background.base).into(), - ), - border_radius: 12.0.into(), + icon_color: Some(cosmic.background.on.into()), + text_color: Some(cosmic.background.on.into()), + background: Some(Color::from(cosmic.background.base).into()), + border_radius: cosmic.corner_radii.radius_m.into(), border_width: 2.0, - border_color: theme.cosmic().bg_divider().into(), + border_color: cosmic.bg_divider().into(), } })) .width(Length::Shrink) From 919aa3309550117d6b120991fdaf61010e11290f Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Wed, 13 Dec 2023 16:45:12 -0500 Subject: [PATCH 2/3] fix: use subscription for popup Done event --- Cargo.lock | 32 +++++++++---------- cosmic-app-list/src/app.rs | 9 +++--- cosmic-applet-audio/src/main.rs | 17 +++++++--- cosmic-applet-battery/src/app.rs | 16 +++++++--- cosmic-applet-bluetooth/src/app.rs | 16 +++++++--- cosmic-applet-graphics/src/window.rs | 4 --- cosmic-applet-network/src/app.rs | 20 ++++++++---- cosmic-applet-notifications/src/main.rs | 16 +++++++--- cosmic-applet-power/src/main.rs | 7 ++-- .../src/components/app.rs | 17 +++++++--- cosmic-applet-tiling/src/window.rs | 20 +++++++++--- cosmic-applet-time/src/window.rs | 16 +++++++--- 12 files changed, 127 insertions(+), 63 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b5c4111a..8b9e399a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1005,7 +1005,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" +source = "git+https://github.com/pop-os/libcosmic#8725497827e87536ac9cad5ddad1a537d68fb8f4" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1019,7 +1019,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" +source = "git+https://github.com/pop-os/libcosmic#8725497827e87536ac9cad5ddad1a537d68fb8f4" dependencies = [ "quote", "syn 1.0.109", @@ -1133,7 +1133,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" +source = "git+https://github.com/pop-os/libcosmic#8725497827e87536ac9cad5ddad1a537d68fb8f4" dependencies = [ "almost", "cosmic-config", @@ -2616,7 +2616,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" +source = "git+https://github.com/pop-os/libcosmic#8725497827e87536ac9cad5ddad1a537d68fb8f4" dependencies = [ "iced_accessibility", "iced_core", @@ -2631,7 +2631,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" +source = "git+https://github.com/pop-os/libcosmic#8725497827e87536ac9cad5ddad1a537d68fb8f4" dependencies = [ "accesskit", "accesskit_unix", @@ -2640,7 +2640,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" +source = "git+https://github.com/pop-os/libcosmic#8725497827e87536ac9cad5ddad1a537d68fb8f4" dependencies = [ "bitflags 1.3.2", "iced_accessibility", @@ -2658,7 +2658,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" +source = "git+https://github.com/pop-os/libcosmic#8725497827e87536ac9cad5ddad1a537d68fb8f4" dependencies = [ "futures", "iced_core", @@ -2671,7 +2671,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" +source = "git+https://github.com/pop-os/libcosmic#8725497827e87536ac9cad5ddad1a537d68fb8f4" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2694,7 +2694,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" +source = "git+https://github.com/pop-os/libcosmic#8725497827e87536ac9cad5ddad1a537d68fb8f4" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2707,7 +2707,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" +source = "git+https://github.com/pop-os/libcosmic#8725497827e87536ac9cad5ddad1a537d68fb8f4" dependencies = [ "iced_accessibility", "iced_core", @@ -2719,7 +2719,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" +source = "git+https://github.com/pop-os/libcosmic#8725497827e87536ac9cad5ddad1a537d68fb8f4" dependencies = [ "enum-repr", "float-cmp", @@ -2743,7 +2743,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" +source = "git+https://github.com/pop-os/libcosmic#8725497827e87536ac9cad5ddad1a537d68fb8f4" dependencies = [ "iced_core", "once_cell", @@ -2753,7 +2753,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" +source = "git+https://github.com/pop-os/libcosmic#8725497827e87536ac9cad5ddad1a537d68fb8f4" dependencies = [ "bytemuck", "cosmic-text", @@ -2771,7 +2771,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" +source = "git+https://github.com/pop-os/libcosmic#8725497827e87536ac9cad5ddad1a537d68fb8f4" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2791,7 +2791,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" +source = "git+https://github.com/pop-os/libcosmic#8725497827e87536ac9cad5ddad1a537d68fb8f4" dependencies = [ "iced_renderer", "iced_runtime", @@ -3059,7 +3059,7 @@ checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#696437506c783da5ce588d26d1f2c2f550c846f1" +source = "git+https://github.com/pop-os/libcosmic#8725497827e87536ac9cad5ddad1a537d68fb8f4" dependencies = [ "apply", "ashpd", diff --git a/cosmic-app-list/src/app.rs b/cosmic-app-list/src/app.rs index ac1d9f76..bb8c91d2 100755 --- a/cosmic-app-list/src/app.rs +++ b/cosmic-app-list/src/app.rs @@ -24,6 +24,8 @@ use cosmic::iced::widget::vertical_space; use cosmic::iced::widget::{column, dnd_source, mouse_area, row, Column, Row}; use cosmic::iced::Color; use cosmic::iced::{window, Subscription}; +use cosmic::iced_core::event::wayland; +use cosmic::iced_core::event::PlatformSpecific; use cosmic::iced_runtime::core::alignment::Horizontal; use cosmic::iced_runtime::core::event; use cosmic::iced_sctk::commands::data_device::accept_mime_type; @@ -1125,6 +1127,9 @@ impl cosmic::Application for CosmicAppList { | event::wayland::DndOfferEvent::DropPerformed, )), ) => Some(Message::StopListeningForDnd), + cosmic::iced::Event::PlatformSpecific(PlatformSpecific::Wayland( + wayland::Event::Popup(wayland::PopupEvent::Done, _, id), + )) => Some(Message::CloseRequested(id)), _ => None, }), rectangle_tracker_subscription(0).map(|update| Message::Rectangle(update.1)), @@ -1145,8 +1150,4 @@ impl cosmic::Application for CosmicAppList { fn style(&self) -> Option<::Style> { Some(cosmic::applet::style()) } - - fn on_close_requested(&self, id: window::Id) -> Option { - Some(Message::CloseRequested(id)) - } } diff --git a/cosmic-applet-audio/src/main.rs b/cosmic-applet-audio/src/main.rs index 4d5943b8..657e045f 100644 --- a/cosmic-applet-audio/src/main.rs +++ b/cosmic-applet-audio/src/main.rs @@ -20,6 +20,9 @@ use cosmic::iced::{ widget::{column, row, slider, text}, window, Alignment, Length, Subscription, }; +use cosmic::iced_core::event::wayland; +use cosmic::iced_core::event::PlatformSpecific; +use cosmic::iced_futures::event::listen_with; use cosmic::iced_runtime::core::alignment::Horizontal; use cosmic::iced_style::application; use cosmic::widget::button; @@ -570,6 +573,16 @@ impl cosmic::Application for Audio { }), mpris_subscription::mpris_subscription(0).map(Message::Mpris), activation_token_subscription(0).map(Message::Token), + listen_with(|e, _| { + if let cosmic::iced::Event::PlatformSpecific(PlatformSpecific::Wayland( + wayland::Event::Popup(wayland::PopupEvent::Done, _, id), + )) = e + { + Some(Message::CloseRequested(id)) + } else { + None + } + }), ]) } @@ -767,10 +780,6 @@ impl cosmic::Application for Audio { self.core.applet.popup_container(container(content)).into() } - - fn on_close_requested(&self, id: window::Id) -> Option { - Some(Message::CloseRequested(id)) - } } fn revealer( diff --git a/cosmic-applet-battery/src/app.rs b/cosmic-applet-battery/src/app.rs index 0e61f0c2..a0bc3c34 100644 --- a/cosmic-applet-battery/src/app.rs +++ b/cosmic-applet-battery/src/app.rs @@ -21,6 +21,8 @@ use cosmic::iced::{ widget::{column, container, row, slider, text}, window, Alignment, Length, Subscription, }; +use cosmic::iced_core::event::{wayland, PlatformSpecific}; +use cosmic::iced_futures::event::listen_with; use cosmic::iced_runtime::core::layout::Limits; use cosmic::iced_style::application; use cosmic::widget::{divider, horizontal_space, icon}; @@ -504,13 +506,19 @@ impl cosmic::Application for CosmicBatteryApplet { .as_subscription() .map(|(_, now)| Message::Frame(now)), activation_token_subscription(0).map(Message::Token), + listen_with(|e, _| { + if let cosmic::iced::Event::PlatformSpecific(PlatformSpecific::Wayland( + wayland::Event::Popup(wayland::PopupEvent::Done, _, id), + )) = e + { + Some(Message::CloseRequested(id)) + } else { + None + } + }), ]) } - fn on_close_requested(&self, id: window::Id) -> Option { - Some(Message::CloseRequested(id)) - } - fn style(&self) -> Option<::Style> { Some(cosmic::applet::style()) } diff --git a/cosmic-applet-bluetooth/src/app.rs b/cosmic-applet-bluetooth/src/app.rs index 7b07786a..01949736 100644 --- a/cosmic-applet-bluetooth/src/app.rs +++ b/cosmic-applet-bluetooth/src/app.rs @@ -5,6 +5,8 @@ use cosmic::applet::token::subscription::{ use cosmic::cctk::sctk::reexports::calloop; use cosmic::applet::{menu_button, padded_control}; +use cosmic::iced_core::event::{wayland, PlatformSpecific}; +use cosmic::iced_futures::event::listen_with; use cosmic::Command; use cosmic::{ iced::{ @@ -556,14 +558,20 @@ impl cosmic::Application for CosmicBluetoothApplet { self.timeline .as_subscription() .map(|(_, now)| Message::Frame(now)), + listen_with(|e, _| { + if let cosmic::iced::Event::PlatformSpecific(PlatformSpecific::Wayland( + wayland::Event::Popup(wayland::PopupEvent::Done, _, id), + )) = e + { + Some(Message::CloseRequested(id)) + } else { + None + } + }), ]) } fn style(&self) -> Option<::Style> { Some(cosmic::applet::style()) } - - fn on_close_requested(&self, id: window::Id) -> Option { - Some(Message::CloseRequested(id)) - } } diff --git a/cosmic-applet-graphics/src/window.rs b/cosmic-applet-graphics/src/window.rs index 294fbeb6..8373104c 100644 --- a/cosmic-applet-graphics/src/window.rs +++ b/cosmic-applet-graphics/src/window.rs @@ -327,10 +327,6 @@ impl cosmic::Application for Window { fn style(&self) -> Option<::Style> { Some(cosmic::applet::style()) } - - fn on_close_requested(&self, id: window::Id) -> Option { - Some(Message::PopupClosed(id)) - } } fn button_icon<'a>( diff --git a/cosmic-applet-network/src/app.rs b/cosmic-applet-network/src/app.rs index 3dd47ee6..8a045287 100644 --- a/cosmic-applet-network/src/app.rs +++ b/cosmic-applet-network/src/app.rs @@ -4,6 +4,8 @@ use cosmic::applet::token::subscription::{ }; use cosmic::applet::{menu_button, menu_control_padding, padded_control}; use cosmic::cctk::sctk::reexports::calloop; +use cosmic::iced_core::event::{wayland, PlatformSpecific}; +use cosmic::iced_futures::event::listen_with; use cosmic::iced_widget::Row; use cosmic::{ iced::{ @@ -819,13 +821,23 @@ impl cosmic::Application for CosmicNetworkApplet { .as_subscription() .map(|(_, now)| Message::Frame(now)); let token_sub = activation_token_subscription(0).map(Message::Token); - + let close_sub = listen_with(|e, _| { + if let cosmic::iced::Event::PlatformSpecific(PlatformSpecific::Wayland( + wayland::Event::Popup(wayland::PopupEvent::Done, _, id), + )) = e + { + Some(Message::CloseRequested(id)) + } else { + None + } + }); if let Some(conn) = self.conn.as_ref() { let has_popup = self.popup.is_some(); Subscription::batch(vec![ timeline, network_sub, token_sub, + close_sub, active_conns_subscription(self.toggle_wifi_ctr, conn.clone()) .map(Message::NetworkManagerEvent), devices_subscription(self.toggle_wifi_ctr, has_popup, conn.clone()) @@ -834,15 +846,11 @@ impl cosmic::Application for CosmicNetworkApplet { .map(Message::NetworkManagerEvent), ]) } else { - Subscription::batch(vec![timeline, network_sub, token_sub]) + Subscription::batch(vec![timeline, network_sub, token_sub, close_sub]) } } fn style(&self) -> Option<::Style> { Some(cosmic::applet::style()) } - - fn on_close_requested(&self, id: window::Id) -> Option { - Some(Message::CloseRequested(id)) - } } diff --git a/cosmic-applet-notifications/src/main.rs b/cosmic-applet-notifications/src/main.rs index 2dafbc52..5582555e 100644 --- a/cosmic-applet-notifications/src/main.rs +++ b/cosmic-applet-notifications/src/main.rs @@ -15,6 +15,8 @@ use cosmic::iced::{ use cosmic::iced_core::alignment::Horizontal; use cosmic::Command; +use cosmic::iced_core::event::{wayland, PlatformSpecific}; +use cosmic::iced_futures::event::listen_with; use cosmic::iced_style::application; use cosmic::iced_widget::{scrollable, Column}; @@ -171,6 +173,16 @@ impl cosmic::Application for Notifications { subscriptions::dbus::proxy().map(Message::DbusEvent), subscriptions::notifications::notifications().map(Message::NotificationEvent), activation_token_subscription(0).map(Message::Token), + listen_with(|e, _| { + if let cosmic::iced::Event::PlatformSpecific(PlatformSpecific::Wayland( + wayland::Event::Popup(wayland::PopupEvent::Done, _, id), + )) = e + { + Some(Message::CloseRequested(id)) + } else { + None + } + }), ]) } @@ -527,10 +539,6 @@ impl cosmic::Application for Notifications { self.core.applet.popup_container(content).into() } - - fn on_close_requested(&self, id: window::Id) -> Option { - Some(Message::CloseRequested(id)) - } } fn text_icon(name: &str, size: u16) -> cosmic::widget::Icon { diff --git a/cosmic-applet-power/src/main.rs b/cosmic-applet-power/src/main.rs index 4e37bcc0..1213d23c 100644 --- a/cosmic-applet-power/src/main.rs +++ b/cosmic-applet-power/src/main.rs @@ -102,16 +102,15 @@ impl cosmic::Application for Power { ) } - fn on_close_requested(&self, id: window::Id) -> Option { - Some(Message::Closed(id)) - } - fn subscription(&self) -> Subscription { let mut subscriptions = Vec::with_capacity(2); subscriptions.push(listen_with(|e, _status| match e { cosmic::iced::Event::PlatformSpecific(PlatformSpecific::Wayland( wayland::Event::Layer(LayerEvent::Unfocused, ..), )) => Some(Message::Cancel), + cosmic::iced::Event::PlatformSpecific(PlatformSpecific::Wayland( + wayland::Event::Popup(wayland::PopupEvent::Done, _, id), + )) => Some(Message::Closed(id)), _ => None, })); if self.action_to_confirm.is_some() { diff --git a/cosmic-applet-status-area/src/components/app.rs b/cosmic-applet-status-area/src/components/app.rs index 51a9a755..76f73786 100644 --- a/cosmic-applet-status-area/src/components/app.rs +++ b/cosmic-applet-status-area/src/components/app.rs @@ -8,6 +8,8 @@ use cosmic::{ }, window, Subscription, }, + iced_core::event::{wayland, PlatformSpecific}, + iced_futures::event::listen_with, iced_style::application, Theme, }; @@ -168,6 +170,17 @@ impl cosmic::Application for App { subscriptions.push(menu.subscription().with(*id).map(Msg::StatusMenu)); } + subscriptions.push(listen_with(|e, _| { + if let cosmic::iced::Event::PlatformSpecific(PlatformSpecific::Wayland( + wayland::Event::Popup(wayland::PopupEvent::Done, _, id), + )) = e + { + Some(Msg::Closed(id)) + } else { + None + } + })); + iced::Subscription::batch(subscriptions) } @@ -201,10 +214,6 @@ impl cosmic::Application for App { None => iced::widget::text("").into(), } } - - fn on_close_requested(&self, id: window::Id) -> Option { - Some(Msg::Closed(id)) - } } pub fn main() -> iced::Result { diff --git a/cosmic-applet-tiling/src/window.rs b/cosmic-applet-tiling/src/window.rs index 29c77a7d..cf698979 100644 --- a/cosmic-applet-tiling/src/window.rs +++ b/cosmic-applet-tiling/src/window.rs @@ -5,7 +5,9 @@ use cosmic::cosmic_config::{ConfigGet, ConfigSet}; use cosmic::iced::wayland::popup::{destroy_popup, get_popup}; use cosmic::iced::window::Id; use cosmic::iced::{Command, Length, Limits, Subscription}; +use cosmic::iced_core::event::{wayland, PlatformSpecific}; use cosmic::iced_core::Alignment; +use cosmic::iced_futures::event::listen_with; use cosmic::iced_style::application; use cosmic::iced_widget::{column, row}; use cosmic::widget::{container, divider, spin_button, text}; @@ -76,16 +78,24 @@ impl cosmic::Application for Window { (window, Command::none()) } - fn on_close_requested(&self, id: Id) -> Option { - Some(Message::PopupClosed(id)) - } - fn subscription(&self) -> Subscription { let timeline = self .timeline .as_subscription() .map(|(_, now)| Message::Frame(now)); - Subscription::batch(vec![timeline]) + Subscription::batch(vec![ + timeline, + listen_with(|e, _| { + if let cosmic::iced::Event::PlatformSpecific(PlatformSpecific::Wayland( + wayland::Event::Popup(wayland::PopupEvent::Done, _, id), + )) = e + { + Some(Message::PopupClosed(id)) + } else { + None + } + }), + ]) } fn update(&mut self, message: Self::Message) -> Command> { diff --git a/cosmic-applet-time/src/window.rs b/cosmic-applet-time/src/window.rs index d7444d06..6b20d84f 100644 --- a/cosmic-applet-time/src/window.rs +++ b/cosmic-applet-time/src/window.rs @@ -7,6 +7,8 @@ use cosmic::iced::{ window, Alignment, Length, Rectangle, Subscription, }; use cosmic::iced_core::alignment::{Horizontal, Vertical}; +use cosmic::iced_core::event::{wayland, PlatformSpecific}; +use cosmic::iced_futures::event::listen_with; use cosmic::iced_style::application; use cosmic::widget::{button, container, divider, grid, Button, Grid, Space}; use cosmic::{app, applet::cosmic_panel_config::PanelAnchor, Command}; @@ -112,6 +114,16 @@ impl cosmic::Application for Window { )) .map(|_| Message::Tick), activation_token_subscription(0).map(Message::Token), + listen_with(|e, _| { + if let cosmic::iced::Event::PlatformSpecific(PlatformSpecific::Wayland( + wayland::Event::Popup(wayland::PopupEvent::Done, _, id), + )) = e + { + Some(Message::CloseRequested(id)) + } else { + None + } + }), ]) } @@ -320,10 +332,6 @@ impl cosmic::Application for Window { .popup_container(container(content_list)) .into() } - - fn on_close_requested(&self, id: window::Id) -> Option { - Some(Message::CloseRequested(id)) - } } fn date_button( From 25f3e09cb0e115b781826eeca12b10b84c4247d9 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Thu, 14 Dec 2023 11:10:14 -0500 Subject: [PATCH 3/3] chore: update cctk --- Cargo.lock | 35 ++++++----------------------------- Cargo.toml | 4 ++-- 2 files changed, 8 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8b9e399a..a0b8f308 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -759,8 +759,8 @@ name = "cosmic-app-list" version = "0.1.0" dependencies = [ "anyhow", - "cosmic-client-toolkit 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=5faec87)", - "cosmic-protocols 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=5faec87)", + "cosmic-client-toolkit", + "cosmic-protocols", "freedesktop-desktop-entry", "freedesktop-icons", "futures", @@ -968,8 +968,8 @@ name = "cosmic-applet-workspaces" version = "0.1.0" dependencies = [ "anyhow", - "cosmic-client-toolkit 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=5faec87)", - "cosmic-protocols 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=5faec87)", + "cosmic-client-toolkit", + "cosmic-protocols", "futures", "i18n-embed 0.13.9", "i18n-embed-fl 0.6.7", @@ -982,22 +982,12 @@ dependencies = [ "xdg", ] -[[package]] -name = "cosmic-client-toolkit" -version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=5faec87#5faec87be0a1fd1d72e99431ac8e6647ff1dfd41" -dependencies = [ - "cosmic-protocols 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=5faec87)", - "smithay-client-toolkit 0.18.0", - "wayland-client 0.31.1", -] - [[package]] name = "cosmic-client-toolkit" version = "0.1.0" source = "git+https://github.com/pop-os/cosmic-protocols?rev=c1b6516#c1b651630c2b71cd8dfd2eb4ab47ede9dbd63840" dependencies = [ - "cosmic-protocols 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=c1b6516)", + "cosmic-protocols", "smithay-client-toolkit 0.18.0", "wayland-client 0.31.1", ] @@ -1083,19 +1073,6 @@ dependencies = [ "xdg-shell-wrapper-config", ] -[[package]] -name = "cosmic-protocols" -version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=5faec87#5faec87be0a1fd1d72e99431ac8e6647ff1dfd41" -dependencies = [ - "bitflags 2.4.1", - "wayland-backend 0.3.2", - "wayland-client 0.31.1", - "wayland-protocols 0.31.0", - "wayland-scanner 0.31.0", - "wayland-server", -] - [[package]] name = "cosmic-protocols" version = "0.1.0" @@ -3063,7 +3040,7 @@ source = "git+https://github.com/pop-os/libcosmic#8725497827e87536ac9cad5ddad1a5 dependencies = [ "apply", "ashpd", - "cosmic-client-toolkit 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=c1b6516)", + "cosmic-client-toolkit", "cosmic-config", "cosmic-panel-config", "cosmic-theme", diff --git a/Cargo.toml b/Cargo.toml index 443e79ff..70cae81c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,10 +19,10 @@ members = [ resolver = "2" [workspace.dependencies] -cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "5faec87" } +cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "c1b6516" } cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = [ "client", -], rev = "5faec87" } +], rev = "c1b6516" } cosmic-time = { git = "https://github.com/pop-os/cosmic-time", default-features = false, features = [ "libcosmic", "once_cell",