From 8bf340aa8e3f63df4fdf2c5c79fd01e77c5336cf Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Mon, 15 Apr 2024 18:37:00 -0400 Subject: [PATCH] chore: update applet icon sizes --- Cargo.lock | 450 +++++++++--------- Cargo.toml | 11 +- cosmic-app-list/src/app.rs | 85 ++-- cosmic-applet-minimize/src/lib.rs | 2 +- .../src/components/app.rs | 3 +- cosmic-applet-time/src/window.rs | 14 +- .../src/components/app.rs | 12 +- cosmic-panel-button/src/main.rs | 6 +- 8 files changed, 297 insertions(+), 286 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6a0930ba..34a548be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -77,9 +77,9 @@ checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "almost" @@ -104,9 +104,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "apply" @@ -206,24 +206,23 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" dependencies = [ "concurrent-queue", - "event-listener 5.2.0", - "event-listener-strategy 0.5.0", + "event-listener 5.3.0", + "event-listener-strategy 0.5.1", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.8.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" dependencies = [ - "async-lock 3.3.0", "async-task", "concurrent-queue", "fastrand 2.0.2", @@ -327,7 +326,7 @@ checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -356,13 +355,13 @@ checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -443,9 +442,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "backtrace" @@ -566,9 +565,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" @@ -587,7 +586,7 @@ checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -614,9 +613,9 @@ dependencies = [ [[package]] name = "calloop" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ "bitflags 2.5.0", "log", @@ -628,9 +627,9 @@ dependencies = [ [[package]] name = "calloop-wayland-source" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ "calloop", "rustix 0.38.32", @@ -640,15 +639,15 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.90" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" [[package]] name = "cfg-expr" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -674,16 +673,16 @@ checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -698,7 +697,7 @@ dependencies = [ [[package]] name = "clipboard_macos" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" dependencies = [ "objc", "objc-foundation", @@ -708,8 +707,9 @@ dependencies = [ [[package]] name = "clipboard_wayland" version = "0.2.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" dependencies = [ + "dnd", "mime 0.1.0", "smithay-clipboard", ] @@ -717,7 +717,7 @@ dependencies = [ [[package]] name = "clipboard_x11" version = "0.4.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" dependencies = [ "thiserror", "x11rb", @@ -847,9 +847,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -879,7 +879,7 @@ dependencies = [ "futures", "i18n-embed", "i18n-embed-fl", - "image 0.25.0", + "image 0.25.1", "itertools", "libcosmic", "memmap2 0.9.4", @@ -965,7 +965,7 @@ dependencies = [ "anyhow", "i18n-embed", "i18n-embed-fl", - "image 0.25.0", + "image 0.25.1", "libcosmic", "memmap2 0.9.4", "once_cell", @@ -1129,11 +1129,11 @@ dependencies = [ [[package]] name = "cosmic-client-toolkit" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=1cc4a13#1cc4a1393d0f8be4d444666e260fdb811b400f49" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=e4e6f8c#e4e6f8ca4d7c239c02a8cdfd48a74cb0969425eb" dependencies = [ "cosmic-protocols", "libc", - "smithay-client-toolkit 0.18.0", + "smithay-client-toolkit", "wayland-client", ] @@ -1150,7 +1150,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#61a14a953dcb052efa6cdaf5b37c74e964896f5f" +source = "git+https://github.com/pop-os/libcosmic#d54af65a2a18e868f48f522bc95bf308be16f678" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1170,7 +1170,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#61a14a953dcb052efa6cdaf5b37c74e964896f5f" +source = "git+https://github.com/pop-os/libcosmic#d54af65a2a18e868f48f522bc95bf308be16f678" dependencies = [ "quote", "syn 1.0.109", @@ -1179,7 +1179,7 @@ dependencies = [ [[package]] name = "cosmic-dbus-networkmanager" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#c81f428acec4c8633efb62b4f8284202dad9a492" +source = "git+https://github.com/pop-os/dbus-settings-bindings#ce9c789fe6c26d01487fe37e968a8f88047e95e0" dependencies = [ "bitflags 2.5.0", "derive_builder", @@ -1223,13 +1223,13 @@ dependencies = [ [[package]] name = "cosmic-panel-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-panel#c2d4b3d9a12894f22e184de93bb0c634a844577c" +source = "git+https://github.com/pop-os/cosmic-panel#585bdafff08f3da9b5234df4f964af4698f120e0" dependencies = [ "anyhow", "cosmic-config", "ron", "serde", - "smithay-client-toolkit 0.18.0", + "smithay-client-toolkit", "tracing", "wayland-protocols-wlr", "xdg-shell-wrapper-config", @@ -1238,7 +1238,7 @@ dependencies = [ [[package]] name = "cosmic-protocols" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=1cc4a13#1cc4a1393d0f8be4d444666e260fdb811b400f49" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=e4e6f8c#e4e6f8ca4d7c239c02a8cdfd48a74cb0969425eb" dependencies = [ "bitflags 2.5.0", "wayland-backend", @@ -1281,7 +1281,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#61a14a953dcb052efa6cdaf5b37c74e964896f5f" +source = "git+https://github.com/pop-os/libcosmic#d54af65a2a18e868f48f522bc95bf308be16f678" dependencies = [ "almost", "cosmic-config", @@ -1297,7 +1297,7 @@ dependencies = [ [[package]] name = "cosmic-time" version = "0.4.0" -source = "git+https://github.com/pop-os/cosmic-time#dd3c1d7a7d248906637c7ec7e471f2340c6a814c" +source = "git+https://github.com/pop-os/cosmic-time#714acf7ebc704a47429491c3fc81335b6e1f474a" dependencies = [ "float-cmp", "libcosmic", @@ -1395,7 +1395,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" dependencies = [ "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -1423,7 +1423,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", "synstructure", ] @@ -1482,7 +1482,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -1504,7 +1504,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core 0.20.8", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -1619,7 +1619,7 @@ dependencies = [ "darling 0.20.8", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -1687,7 +1687,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -1708,11 +1708,23 @@ dependencies = [ "const-random", ] +[[package]] +name = "dnd" +version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" +dependencies = [ + "bitflags 2.5.0", + "mime 0.1.0", + "raw-window-handle 0.6.0", + "smithay-client-toolkit", + "smithay-clipboard", +] + [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "drm" @@ -1755,9 +1767,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "enum-repr" @@ -1788,7 +1800,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -1862,9 +1874,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" dependencies = [ "concurrent-queue", "parking", @@ -1883,11 +1895,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" dependencies = [ - "event-listener 5.2.0", + "event-listener 5.3.0", "pin-project-lite", ] @@ -2054,9 +2066,12 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-types" -version = "0.4.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b7f6040d337bd44434ab21fc6509154edf2cece88b23758d9d64654c4e7730b" +checksum = "bd6784a76a9c2b136ea3b8462391e9328252e938eb706eb44d752723b4c3a533" +dependencies = [ + "bytemuck", +] [[package]] name = "fontconfig-parser" @@ -2099,7 +2114,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -2247,7 +2262,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -2332,9 +2347,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "libc", @@ -2558,9 +2573,9 @@ dependencies = [ [[package]] name = "half" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", @@ -2674,7 +2689,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.55", + "syn 2.0.59", "unic-langid", ] @@ -2688,7 +2703,7 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -2717,8 +2732,9 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#61a14a953dcb052efa6cdaf5b37c74e964896f5f" +source = "git+https://github.com/pop-os/libcosmic#d54af65a2a18e868f48f522bc95bf308be16f678" dependencies = [ + "dnd", "iced_accessibility", "iced_core", "iced_futures", @@ -2726,6 +2742,7 @@ dependencies = [ "iced_sctk", "iced_widget", "image 0.24.9", + "mime 0.1.0", "thiserror", "window_clipboard", ] @@ -2733,7 +2750,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#61a14a953dcb052efa6cdaf5b37c74e964896f5f" +source = "git+https://github.com/pop-os/libcosmic#d54af65a2a18e868f48f522bc95bf308be16f678" dependencies = [ "accesskit", "accesskit_unix", @@ -2742,16 +2759,18 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#61a14a953dcb052efa6cdaf5b37c74e964896f5f" +source = "git+https://github.com/pop-os/libcosmic#d54af65a2a18e868f48f522bc95bf308be16f678" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", + "dnd", "iced_accessibility", "log", + "mime 0.1.0", "num-traits", "palette", "raw-window-handle 0.6.0", "serde", - "smithay-client-toolkit 0.18.0", + "smithay-client-toolkit", "smol_str", "thiserror", "web-time", @@ -2762,7 +2781,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#61a14a953dcb052efa6cdaf5b37c74e964896f5f" +source = "git+https://github.com/pop-os/libcosmic#d54af65a2a18e868f48f522bc95bf308be16f678" dependencies = [ "futures", "iced_core", @@ -2775,9 +2794,9 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#61a14a953dcb052efa6cdaf5b37c74e964896f5f" +source = "git+https://github.com/pop-os/libcosmic#d54af65a2a18e868f48f522bc95bf308be16f678" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "bytemuck", "cosmic-text", "glam", @@ -2799,7 +2818,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#61a14a953dcb052efa6cdaf5b37c74e964896f5f" +source = "git+https://github.com/pop-os/libcosmic#d54af65a2a18e868f48f522bc95bf308be16f678" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2811,12 +2830,13 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#61a14a953dcb052efa6cdaf5b37c74e964896f5f" +source = "git+https://github.com/pop-os/libcosmic#d54af65a2a18e868f48f522bc95bf308be16f678" dependencies = [ + "dnd", "iced_accessibility", "iced_core", "iced_futures", - "smithay-client-toolkit 0.18.0", + "smithay-client-toolkit", "thiserror", "window_clipboard", ] @@ -2824,7 +2844,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#61a14a953dcb052efa6cdaf5b37c74e964896f5f" +source = "git+https://github.com/pop-os/libcosmic#d54af65a2a18e868f48f522bc95bf308be16f678" dependencies = [ "enum-repr", "float-cmp", @@ -2836,7 +2856,7 @@ dependencies = [ "itertools", "lazy_static", "raw-window-handle 0.6.0", - "smithay-client-toolkit 0.18.0", + "smithay-client-toolkit", "thiserror", "tracing", "wayland-backend", @@ -2850,7 +2870,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#61a14a953dcb052efa6cdaf5b37c74e964896f5f" +source = "git+https://github.com/pop-os/libcosmic#d54af65a2a18e868f48f522bc95bf308be16f678" dependencies = [ "iced_core", "once_cell", @@ -2860,7 +2880,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#61a14a953dcb052efa6cdaf5b37c74e964896f5f" +source = "git+https://github.com/pop-os/libcosmic#d54af65a2a18e868f48f522bc95bf308be16f678" dependencies = [ "bytemuck", "cosmic-text", @@ -2877,9 +2897,9 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#61a14a953dcb052efa6cdaf5b37c74e964896f5f" +source = "git+https://github.com/pop-os/libcosmic#d54af65a2a18e868f48f522bc95bf308be16f678" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "bytemuck", "futures", "glam", @@ -2896,16 +2916,18 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#61a14a953dcb052efa6cdaf5b37c74e964896f5f" +source = "git+https://github.com/pop-os/libcosmic#d54af65a2a18e868f48f522bc95bf308be16f678" dependencies = [ + "dnd", "iced_renderer", "iced_runtime", "iced_style", "num-traits", "ouroboros", - "smithay-client-toolkit 0.18.0", + "smithay-client-toolkit", "thiserror", "unicode-segmentation", + "window_clipboard", ] [[package]] @@ -2944,9 +2966,9 @@ dependencies = [ [[package]] name = "image" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9b4f005360d32e9325029b38ba47ebd7a56f3316df09249368939562d518645" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" dependencies = [ "bytemuck", "byteorder", @@ -3065,9 +3087,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jpeg-decoder" @@ -3172,7 +3194,7 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#61a14a953dcb052efa6cdaf5b37c74e964896f5f" +source = "git+https://github.com/pop-os/libcosmic#d54af65a2a18e868f48f522bc95bf308be16f678" dependencies = [ "apply", "ashpd 0.7.0", @@ -3239,7 +3261,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -3277,13 +3299,12 @@ dependencies = [ [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.5.0", "libc", - "redox_syscall 0.4.1", ] [[package]] @@ -3440,9 +3461,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" @@ -3473,9 +3494,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -3498,7 +3519,7 @@ dependencies = [ [[package]] name = "mime" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" dependencies = [ "smithay-clipboard", ] @@ -3534,7 +3555,7 @@ dependencies = [ [[package]] name = "mpris2-zbus" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#c81f428acec4c8633efb62b4f8284202dad9a492" +source = "git+https://github.com/pop-os/dbus-settings-bindings#ce9c789fe6c26d01487fe37e968a8f88047e95e0" dependencies = [ "futures-util", "serde", @@ -3624,9 +3645,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41" dependencies = [ "num-bigint", "num-complex", @@ -3681,7 +3702,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -3798,9 +3819,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "ordered-multimap" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4d6a8c22fc714f0c2373e6091bf6f5e9b37b1bc0b1184874b7e0a4e303d318f" +checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" dependencies = [ "dlv-list", "hashbrown", @@ -3837,7 +3858,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -3867,7 +3888,7 @@ checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -3978,7 +3999,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -4013,14 +4034,14 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -4143,9 +4164,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e" dependencies = [ "unicode-ident", ] @@ -4199,9 +4220,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -4288,10 +4309,11 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" [[package]] name = "read-fonts" -version = "0.16.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81c524658d3b77930a391f559756d91dbe829ab6cf4687083f615d395df99722" +checksum = "ea75b5ec052843434d263ef7a4c31cf86db5908c729694afb1ad3c884252a1b6" dependencies = [ + "bytemuck", "font-types", ] @@ -4315,9 +4337,9 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", @@ -4333,7 +4355,7 @@ dependencies = [ "aho-corasick", "memchr", "regex-automata 0.4.6", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -4353,7 +4375,7 @@ checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -4364,9 +4386,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "renderdoc-sys" @@ -4462,7 +4484,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.55", + "syn 2.0.59", "walkdir", ] @@ -4527,9 +4549,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "rustybuzz" @@ -4607,14 +4629,14 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "itoa", "ryu", @@ -4623,13 +4645,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -4735,7 +4757,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay-client-toolkit" version = "0.18.0" -source = "git+https://github.com/smithay/client-toolkit//?rev=e63ab5f#e63ab5f01964bc48766fc4c3bf79cc05dc59874c" +source = "git+https://github.com/smithay/client-toolkit//?rev=3bed072#3bed072b966022f5f929d12f3aff089b1ace980b" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -4759,38 +4781,14 @@ dependencies = [ "xkeysym", ] -[[package]] -name = "smithay-client-toolkit" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" -dependencies = [ - "bitflags 2.5.0", - "calloop", - "calloop-wayland-source", - "cursor-icon", - "libc", - "log", - "memmap2 0.9.4", - "rustix 0.38.32", - "thiserror", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols", - "wayland-protocols-wlr", - "wayland-scanner", - "xkeysym", -] - [[package]] name = "smithay-clipboard" version = "0.8.0" -source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-mime-types#cc0101c1f9ccc937a413bd3af3c0f6217f27e935" +source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-3#2f2430bec35f0adb9cb93e85e648ff8449d44dad" dependencies = [ "libc", - "smithay-client-toolkit 0.18.1", + "raw-window-handle 0.6.0", + "smithay-client-toolkit", "wayland-backend", ] @@ -4911,7 +4909,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -4932,9 +4930,9 @@ dependencies = [ [[package]] name = "swash" -version = "0.1.13" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9af636fb90d39858650cae1088a37e2862dab4e874a0bb49d6dfb5b2dacf0e24" +checksum = "06ec889a8e0a6fcb91041996c8f1f6be0fe1a09e94478785e07c32ce2bca2d2b" dependencies = [ "read-fonts", "yazi", @@ -4944,7 +4942,7 @@ dependencies = [ [[package]] name = "switcheroo-control" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#c81f428acec4c8633efb62b4f8284202dad9a492" +source = "git+https://github.com/pop-os/dbus-settings-bindings#ce9c789fe6c26d01487fe37e968a8f88047e95e0" dependencies = [ "zbus", ] @@ -4962,9 +4960,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.55" +version = "2.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" +checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" dependencies = [ "proc-macro2", "quote", @@ -4979,7 +4977,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -5065,7 +5063,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -5091,9 +5089,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "num-conv", @@ -5111,9 +5109,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -5192,9 +5190,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -5218,7 +5216,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -5283,7 +5281,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.6", ] [[package]] @@ -5305,7 +5303,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] @@ -5386,7 +5384,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.0", + "memoffset 0.9.1", "tempfile", "winapi", ] @@ -5634,7 +5632,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", "wasm-bindgen-shared", ] @@ -5668,7 +5666,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5936,9 +5934,9 @@ dependencies = [ [[package]] name = "widestring" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi" @@ -5974,12 +5972,13 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window_clipboard" version = "0.4.1" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" dependencies = [ "clipboard-win", "clipboard_macos", "clipboard_wayland", "clipboard_x11", + "dnd", "mime 0.1.0", "raw-window-handle 0.6.0", "thiserror", @@ -5992,7 +5991,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -6001,7 +6000,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -6019,7 +6018,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -6039,17 +6038,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -6060,9 +6060,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -6072,9 +6072,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -6084,9 +6084,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -6096,9 +6102,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -6108,9 +6114,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -6120,9 +6126,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -6132,9 +6138,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -6147,9 +6153,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" dependencies = [ "memchr", ] @@ -6241,9 +6247,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "xmlwriter" @@ -6353,7 +6359,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.59", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 348ab45b..d67c9e03 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,17 +21,20 @@ resolver = "2" [workspace.dependencies] anyhow = "1.0.81" -cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "1cc4a13" } +cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "e4e6f8c" } cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = [ "client", -], rev = "1cc4a13" } +], rev = "e4e6f8c" } cosmic-time = { git = "https://github.com/pop-os/cosmic-time", default-features = false, features = [ "libcosmic", "once_cell", ] } futures = "0.3" futures-util = "0.3" -i18n-embed = { version = "0.14.1", features = ["fluent-system", "desktop-requester"] } +i18n-embed = { version = "0.14.1", features = [ + "fluent-system", + "desktop-requester", +] } i18n-embed-fl = "0.8" libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false, features = [ "applet", @@ -56,4 +59,4 @@ lto = "fat" ignored = ["libcosmic"] [patch."https://github.com/Smithay/client-toolkit"] -sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay-client-toolkit", rev = "e63ab5f" } +sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay-client-toolkit", rev = "3bed072" } diff --git a/cosmic-app-list/src/app.rs b/cosmic-app-list/src/app.rs index 049abd45..f104ba6e 100755 --- a/cosmic-app-list/src/app.rs +++ b/cosmic-app-list/src/app.rs @@ -48,6 +48,7 @@ use cosmic::theme::Button; use cosmic::theme::Container; use cosmic::widget::button; use cosmic::widget::divider; +use cosmic::widget::horizontal_space; use cosmic::widget::rectangle_tracker::rectangle_tracker_subscription; use cosmic::widget::rectangle_tracker::RectangleTracker; use cosmic::widget::rectangle_tracker::RectangleUpdate; @@ -112,32 +113,38 @@ pub fn load_applications_for_app_ids_sorted<'a, 'b>( struct AppletIconData { icon_size: u16, icon_spacing: f32, - dot_size: f32, + dot_radius: f32, dot_spacing: f32, - padding: [u16; 2], + padding: Padding, } impl AppletIconData { fn new(applet: &Context) -> Self { - let suggested_size = applet.suggested_size().0; - let (icon_size, icon_spacing, dot_size, dot_spacing, p_padding) = match applet.size { - Size::PanelSize(PanelSize::XL) => (10 + suggested_size, 0.0, 2.0, 4.0, 5), - Size::PanelSize(PanelSize::L) => (10 + suggested_size, 0.0, 2.0, 4.0, 5), - Size::PanelSize(PanelSize::M) => (10 + suggested_size, 0.0, 2.0, 4.0, 5), - Size::PanelSize(PanelSize::S) => (16 + suggested_size, 0.0, 1.0, 2.0, 3), - Size::PanelSize(PanelSize::XS) => (8 + suggested_size, 0.0, 1.0, 2.0, 3), - Size::Hardcoded(_) => (10 + suggested_size, 4.0, 0.0, 4.0, 5), + let icon_size = applet.suggested_size(false).0; + let padding = applet.suggested_padding(false); + + let (icon_spacing, dot_radius, dot_spacing) = match applet.size { + Size::PanelSize(PanelSize::XL) => (0.0, 2.0, 4.0), + Size::PanelSize(PanelSize::L) | Size::PanelSize(PanelSize::M) | Size::Hardcoded(_) => { + (0.0, 2.0, 4.0) + } + Size::PanelSize(PanelSize::XS) | Size::PanelSize(PanelSize::S) => (0.0, 1.0, 2.0), }; + + let padding = padding as f32; + let padding = match applet.anchor { - PanelAnchor::Bottom | PanelAnchor::Top => [0, p_padding], - PanelAnchor::Left | PanelAnchor::Right => [p_padding, 0], + PanelAnchor::Top => [padding, padding, padding - (dot_radius * 2. + 1.), padding], + PanelAnchor::Bottom => [padding - (dot_radius * 2. + 1.), padding, padding, padding], + PanelAnchor::Left => [padding, padding, padding, padding - (dot_radius * 2. + 1.)], + PanelAnchor::Right => [padding, padding - (dot_radius * 2. + 1.), padding, padding], }; AppletIconData { icon_size, icon_spacing, - dot_size, + dot_radius, dot_spacing, - padding, + padding: padding.into(), } } } @@ -185,6 +192,7 @@ impl DockItem { interaction_enabled: bool, gpus: Option<&[Gpu]>, is_focused: bool, + dot_border_radius: [f32; 4], ) -> Element<'_, Message> { let Self { toplevels, @@ -197,19 +205,11 @@ impl DockItem { let cosmic_icon = desktop_info.icon.as_cosmic_icon().size(app_icon.icon_size); - let dot_spacer = (0..1) - .map(|_| { - container(vertical_space(Length::Fixed(0.0))) - .padding(app_icon.dot_size) - .into() - }) - .collect_vec(); - let dots = if toplevels.is_empty() { (0..1) .map(|_| { container(vertical_space(Length::Fixed(0.0))) - .padding(app_icon.dot_size) + .padding(app_icon.dot_radius) .into() }) .collect_vec() @@ -217,15 +217,15 @@ impl DockItem { (0..min(toplevels.len(), 3)) .map(|_| { container(vertical_space(Length::Fixed(0.0))) - .padding(app_icon.dot_size) + .padding(app_icon.dot_radius) .style(::Style::Custom(Box::new( - |theme| container::Appearance { + move |theme| container::Appearance { text_color: Some(Color::TRANSPARENT), background: Some(Background::Color( theme.cosmic().on_bg_color().into(), )), border: Border { - radius: 4.0.into(), + radius: dot_border_radius.into(), width: 0.0, color: Color::TRANSPARENT, }, @@ -241,35 +241,31 @@ impl DockItem { let icon_wrapper: Element<_> = match applet.anchor { PanelAnchor::Left => row(vec![ column(dots).spacing(app_icon.dot_spacing).into(), + horizontal_space(Length::Fixed(1.0)).into(), cosmic_icon.into(), - column(dot_spacer).spacing(app_icon.dot_spacing).into(), ]) .align_items(iced::Alignment::Center) - .spacing(1) .into(), PanelAnchor::Right => row(vec![ - column(dot_spacer).spacing(app_icon.dot_spacing).into(), cosmic_icon.into(), + horizontal_space(Length::Fixed(1.0)).into(), column(dots).spacing(app_icon.dot_spacing).into(), ]) .align_items(iced::Alignment::Center) - .spacing(1) .into(), PanelAnchor::Top => column(vec![ row(dots).spacing(app_icon.dot_spacing).into(), + vertical_space(Length::Fixed(1.0)).into(), cosmic_icon.into(), - row(dot_spacer).spacing(app_icon.dot_spacing).into(), ]) .align_items(iced::Alignment::Center) - .spacing(1) .into(), PanelAnchor::Bottom => column(vec![ - row(dot_spacer).spacing(app_icon.dot_spacing).into(), cosmic_icon.into(), + vertical_space(Length::Fixed(1.0)).into(), row(dots).spacing(app_icon.dot_spacing).into(), ]) .align_items(iced::Alignment::Center) - .spacing(1) .into(), }; @@ -898,7 +894,7 @@ impl cosmic::Application for CosmicAppList { } } Message::DndEnter(x, y) => { - let item_size = self.core.applet.suggested_size().0; + let item_size = self.core.applet.suggested_size(false).0; let pos_in_list = match self.core.applet.anchor { PanelAnchor::Top | PanelAnchor::Bottom => x, PanelAnchor::Left | PanelAnchor::Right => y, @@ -929,7 +925,7 @@ impl cosmic::Application for CosmicAppList { } Message::DndMotion(x, y) => { if let Some(DndOffer { preview_index, .. }) = self.dnd_offer.as_mut() { - let item_size = self.core.applet.suggested_size().0; + let item_size = self.core.applet.suggested_size(false).0; let pos_in_list = match self.core.applet.anchor { PanelAnchor::Top | PanelAnchor::Bottom => x, PanelAnchor::Left | PanelAnchor::Right => y, @@ -1231,6 +1227,8 @@ impl cosmic::Application for CosmicAppList { fn view(&self) -> Element { let focused_item = self.currently_active_toplevel(); + let theme = self.core.system_theme(); + let dot_radius = theme.cosmic().radius_xs(); let app_icon = AppletIconData::new(&self.core.applet); let is_horizontal = match self.core.applet.anchor { PanelAnchor::Top | PanelAnchor::Bottom => true, @@ -1249,6 +1247,7 @@ impl cosmic::Application for CosmicAppList { .toplevels .iter() .any(|y| focused_item.contains(&y.0)), + theme.cosmic().radius_xs(), ) }) .collect(); @@ -1266,6 +1265,7 @@ impl cosmic::Application for CosmicAppList { false, self.gpus.as_deref(), item.toplevels.iter().any(|y| focused_item.contains(&y.0)), + dot_radius, ), ); } else if self.is_listening_for_dnd && self.favorite_list.is_empty() { @@ -1273,9 +1273,9 @@ impl cosmic::Application for CosmicAppList { favorites.push( container( cosmic::widget::icon::from_name("starred-symbolic.symbolic") - .size(self.core.applet.suggested_size().0), + .size(self.core.applet.suggested_size(false).0), ) - .padding(8) + .padding(self.core.applet.suggested_padding(false)) .into(), ); } @@ -1293,6 +1293,7 @@ impl cosmic::Application for CosmicAppList { .toplevels .iter() .any(|y| focused_item.contains(&y.0)), + dot_radius, ) }) .collect(); @@ -1359,7 +1360,7 @@ impl cosmic::Application for CosmicAppList { } else { vec![ cosmic::widget::icon::from_name("com.system76.CosmicAppList") - .size(self.core.applet.suggested_size().0) + .size(self.core.applet.suggested_size(false).0) .into(), ] }; @@ -1381,7 +1382,7 @@ impl cosmic::Application for CosmicAppList { ), }; if self.active_list.is_empty() && self.favorite_list.is_empty() { - let suggested_size = self.core.applet.suggested_size(); + let suggested_size = self.core.applet.suggested_size(false); content = content.width(suggested_size.0).height(suggested_size.1); } if self.popup.is_some() { @@ -1399,7 +1400,7 @@ impl cosmic::Application for CosmicAppList { item.desktop_info .icon .as_cosmic_icon() - .size(self.core.applet.suggested_size().0) + .size(self.core.applet.suggested_size(false).0) .into() } else if let Some((_popup_id, id, popup_type)) = self.popup.as_ref().filter(|p| id == p.0) { @@ -1551,7 +1552,7 @@ impl cosmic::Application for CosmicAppList { }, } } else { - let suggested = self.core.applet.suggested_size(); + let suggested = self.core.applet.suggested_size(false); iced::widget::row!() .width(Length::Fixed(suggested.0 as f32)) .height(Length::Fixed(suggested.1 as f32)) diff --git a/cosmic-applet-minimize/src/lib.rs b/cosmic-applet-minimize/src/lib.rs index b3ecd64c..e8c59fb3 100644 --- a/cosmic-applet-minimize/src/lib.rs +++ b/cosmic-applet-minimize/src/lib.rs @@ -124,7 +124,7 @@ impl cosmic::Application for Minimize { } fn view(&self) -> Element { - let (width, _) = self.core.applet.suggested_size(); + let (width, _) = self.core.applet.suggested_size(false); let theme = self.core.system_theme().cosmic(); let space_xxs = theme.space_xxs(); let icon_buttons = self.apps.iter().map(|(handle, _, data, img)| { diff --git a/cosmic-applet-status-area/src/components/app.rs b/cosmic-applet-status-area/src/components/app.rs index 2430b593..153259be 100644 --- a/cosmic-applet-status-area/src/components/app.rs +++ b/cosmic-applet-status-area/src/components/app.rs @@ -49,7 +49,8 @@ impl App { } fn resize_window(&self) -> Command { - let icon_size = self.core.applet.suggested_size().0 as u32 + APPLET_PADDING * 2; + let icon_size = self.core.applet.suggested_size(true).0 as u32 + + self.core.applet.suggested_padding(true) as u32 * 2; let n = self.menus.len() as u32; resize_window(window::Id::MAIN, 1.max(icon_size * n), icon_size) } diff --git a/cosmic-applet-time/src/window.rs b/cosmic-applet-time/src/window.rs index 14b714cf..438dfa0d 100644 --- a/cosmic-applet-time/src/window.rs +++ b/cosmic-applet-time/src/window.rs @@ -249,8 +249,8 @@ impl cosmic::Application for Window { row!( cosmic::widget::text(self.now.format(format).to_string()).size(14), container(vertical_space(Length::Fixed( - (self.core.applet.suggested_size().1 - + 2 * self.core.applet.suggested_padding()) + (self.core.applet.suggested_size(true).1 + + 2 * self.core.applet.suggested_padding(true)) as f32 ))) ) @@ -276,7 +276,7 @@ impl cosmic::Application for Window { date_time_col = date_time_col.push( // TODO better calendar icon? icon::from_name("calendar-go-today-symbolic") - .size(self.core.applet.suggested_size().0) + .size(self.core.applet.suggested_size(true).0) .symbolic(true), ); for d in self.now.format("%x").to_string().split('/') { @@ -287,8 +287,8 @@ impl cosmic::Application for Window { column!( date_time_col, horizontal_space(Length::Fixed( - (self.core.applet.suggested_size().0 - + 2 * self.core.applet.suggested_padding()) + (self.core.applet.suggested_size(true).0 + + 2 * self.core.applet.suggested_padding(true)) as f32 )) ) @@ -296,9 +296,9 @@ impl cosmic::Application for Window { ) }) .padding(if horizontal { - [0, self.core.applet.suggested_padding()] + [0, self.core.applet.suggested_padding(true)] } else { - [self.core.applet.suggested_padding(), 0] + [self.core.applet.suggested_padding(true), 0] }) .on_press(Message::TogglePopup) .style(cosmic::theme::Button::AppletIcon); diff --git a/cosmic-applet-workspaces/src/components/app.rs b/cosmic-applet-workspaces/src/components/app.rs index 1464a8f0..9f39cf76 100644 --- a/cosmic-applet-workspaces/src/components/app.rs +++ b/cosmic-applet-workspaces/src/components/app.rs @@ -138,8 +138,8 @@ impl cosmic::Application for IcedWorkspacesApplet { let content = row!( content, vertical_space(Length::Fixed( - (self.core.applet.suggested_size().1 + 2 * self.core.applet.suggested_padding()) - as f32 + (self.core.applet.suggested_size(true).1 + + 2 * self.core.applet.suggested_padding(true)) as f32 )) ) .align_items(cosmic::iced::Alignment::Center); @@ -147,8 +147,8 @@ impl cosmic::Application for IcedWorkspacesApplet { let content = column!( content, horizontal_space(Length::Fixed( - (self.core.applet.suggested_size().0 + 2 * self.core.applet.suggested_padding()) - as f32 + (self.core.applet.suggested_size(true).0 + + 2 * self.core.applet.suggested_padding(true)) as f32 )) ) .align_items(cosmic::iced::Alignment::Center); @@ -159,9 +159,9 @@ impl cosmic::Application for IcedWorkspacesApplet { .align_y(Vertical::Center), ) .padding(if horizontal { - [0, self.core.applet.suggested_padding()] + [0, self.core.applet.suggested_padding(true)] } else { - [self.core.applet.suggested_padding(), 0] + [self.core.applet.suggested_padding(true), 0] }) .on_press(match w.1 { Some(zcosmic_workspace_handle_v1::State::Active) => Message::WorkspaceOverview, diff --git a/cosmic-panel-button/src/main.rs b/cosmic-panel-button/src/main.rs index ad9403a0..6e94f87d 100644 --- a/cosmic-panel-button/src/main.rs +++ b/cosmic-panel-button/src/main.rs @@ -67,13 +67,13 @@ impl cosmic::Application for Button { let content = row!( text(&self.desktop.name).size(14.0), vertical_space(Length::Fixed( - (self.core.applet.suggested_size().1 + 2 * self.core.applet.suggested_padding()) - as f32 + (self.core.applet.suggested_size(true).1 + + 2 * self.core.applet.suggested_padding(true)) as f32 )) ) .align_items(iced::Alignment::Center); cosmic::widget::button(content) - .padding([0, self.core.applet.suggested_padding()]) + .padding([0, self.core.applet.suggested_padding(false)]) .style(cosmic::theme::Button::AppletIcon) } .on_press(Msg::Press)