From 4fcdc77603919895e738027a5a9c37b9aa69f2fe Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 14 May 2024 11:15:54 -0600 Subject: [PATCH] Update libcosmic --- Cargo.lock | 181 ++++++++++++++++++++++++++++---------------------- src/dialog.rs | 8 +-- src/tab.rs | 5 -- 3 files changed, 104 insertions(+), 90 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3b6f90b..1f08072 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.25" +version = "0.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f90148830dac590fac7ccfe78ec4a8ea404c60f75a24e16407a71f0f40de775" +checksum = "2e53b0a3d5760cd2ba9b787ae0c6440ad18ee294ff71b05e3381c900a7d16cfd" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -346,9 +346,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" +checksum = "9f2776ead772134d55b62dd45e59a79e21612d85d0af729b8b7d3967d601a62a" dependencies = [ "concurrent-queue", "event-listener 5.3.0", @@ -466,7 +466,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -501,7 +501,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -715,9 +715,9 @@ checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" dependencies = [ "bytemuck_derive", ] @@ -730,7 +730,7 @@ checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -848,9 +848,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "cfg_aliases" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" @@ -1070,7 +1070,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#3cfc5c16a306d7d38a507554d46f4fe5857cab78" +source = "git+https://github.com/pop-os/libcosmic.git#a2e2711061d739e9aef3231beca63d3ee465ee9f" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1081,13 +1081,15 @@ dependencies = [ "once_cell", "ron", "serde", + "tokio", + "tracing", "xdg", ] [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#3cfc5c16a306d7d38a507554d46f4fe5857cab78" +source = "git+https://github.com/pop-os/libcosmic.git#a2e2711061d739e9aef3231beca63d3ee465ee9f" dependencies = [ "quote", "syn 1.0.109", @@ -1147,7 +1149,7 @@ dependencies = [ "self_cell 1.0.4", "swash", "sys-locale", - "ttf-parser", + "ttf-parser 0.20.0", "unicode-bidi", "unicode-linebreak", "unicode-script", @@ -1157,7 +1159,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#3cfc5c16a306d7d38a507554d46f4fe5857cab78" +source = "git+https://github.com/pop-os/libcosmic.git#a2e2711061d739e9aef3231beca63d3ee465ee9f" dependencies = [ "almost", "cosmic-config", @@ -1167,6 +1169,7 @@ dependencies = [ "palette", "ron", "serde", + "serde_json", "thiserror", ] @@ -1261,7 +1264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -1301,7 +1304,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -1312,7 +1315,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -1363,7 +1366,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -1452,7 +1455,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -1554,7 +1557,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -1866,7 +1869,7 @@ dependencies = [ "memmap2", "slotmap", "tinyvec", - "ttf-parser", + "ttf-parser 0.20.0", ] [[package]] @@ -1887,7 +1890,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -2060,7 +2063,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -2263,9 +2266,9 @@ checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" [[package]] name = "glib" -version = "0.19.5" +version = "0.19.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be682de2914107f591efdbe2debf05d9ad70726310ee2b6a3802a697649fcc55" +checksum = "b0116c428e4841cab183a32a71b900fd6712194c20f9c424f01d2c016c96bd23" dependencies = [ "bitflags 2.5.0", "futures-channel", @@ -2293,7 +2296,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -2586,7 +2589,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.61", + "syn 2.0.63", "unic-langid", ] @@ -2600,7 +2603,7 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -2629,7 +2632,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#3cfc5c16a306d7d38a507554d46f4fe5857cab78" +source = "git+https://github.com/pop-os/libcosmic.git#a2e2711061d739e9aef3231beca63d3ee465ee9f" dependencies = [ "dnd", "iced_accessibility", @@ -2647,7 +2650,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#3cfc5c16a306d7d38a507554d46f4fe5857cab78" +source = "git+https://github.com/pop-os/libcosmic.git#a2e2711061d739e9aef3231beca63d3ee465ee9f" dependencies = [ "accesskit", "accesskit_winit", @@ -2656,7 +2659,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#3cfc5c16a306d7d38a507554d46f4fe5857cab78" +source = "git+https://github.com/pop-os/libcosmic.git#a2e2711061d739e9aef3231beca63d3ee465ee9f" dependencies = [ "bitflags 2.5.0", "dnd", @@ -2676,7 +2679,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#3cfc5c16a306d7d38a507554d46f4fe5857cab78" +source = "git+https://github.com/pop-os/libcosmic.git#a2e2711061d739e9aef3231beca63d3ee465ee9f" dependencies = [ "futures", "iced_core", @@ -2689,7 +2692,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#3cfc5c16a306d7d38a507554d46f4fe5857cab78" +source = "git+https://github.com/pop-os/libcosmic.git#a2e2711061d739e9aef3231beca63d3ee465ee9f" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2713,7 +2716,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#3cfc5c16a306d7d38a507554d46f4fe5857cab78" +source = "git+https://github.com/pop-os/libcosmic.git#a2e2711061d739e9aef3231beca63d3ee465ee9f" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2725,7 +2728,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#3cfc5c16a306d7d38a507554d46f4fe5857cab78" +source = "git+https://github.com/pop-os/libcosmic.git#a2e2711061d739e9aef3231beca63d3ee465ee9f" dependencies = [ "dnd", "iced_core", @@ -2737,7 +2740,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#3cfc5c16a306d7d38a507554d46f4fe5857cab78" +source = "git+https://github.com/pop-os/libcosmic.git#a2e2711061d739e9aef3231beca63d3ee465ee9f" dependencies = [ "iced_core", "once_cell", @@ -2747,7 +2750,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#3cfc5c16a306d7d38a507554d46f4fe5857cab78" +source = "git+https://github.com/pop-os/libcosmic.git#a2e2711061d739e9aef3231beca63d3ee465ee9f" dependencies = [ "bytemuck", "cosmic-text", @@ -2764,7 +2767,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#3cfc5c16a306d7d38a507554d46f4fe5857cab78" +source = "git+https://github.com/pop-os/libcosmic.git#a2e2711061d739e9aef3231beca63d3ee465ee9f" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2783,7 +2786,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#3cfc5c16a306d7d38a507554d46f4fe5857cab78" +source = "git+https://github.com/pop-os/libcosmic.git#a2e2711061d739e9aef3231beca63d3ee465ee9f" dependencies = [ "dnd", "iced_renderer", @@ -2799,7 +2802,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#3cfc5c16a306d7d38a507554d46f4fe5857cab78" +source = "git+https://github.com/pop-os/libcosmic.git#a2e2711061d739e9aef3231beca63d3ee465ee9f" dependencies = [ "dnd", "iced_graphics", @@ -3131,7 +3134,7 @@ checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#3cfc5c16a306d7d38a507554d46f4fe5857cab78" +source = "git+https://github.com/pop-os/libcosmic.git#a2e2711061d739e9aef3231beca63d3ee465ee9f" dependencies = [ "apply", "ashpd 0.7.0", @@ -3693,7 +3696,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -3864,7 +3867,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -3875,11 +3878,11 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owned_ttf_parser" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" +checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5" dependencies = [ - "ttf-parser", + "ttf-parser 0.21.1", ] [[package]] @@ -3904,7 +3907,7 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -4021,7 +4024,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -4053,9 +4056,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" dependencies = [ "atomic-waker", "fastrand 2.1.0", @@ -4478,9 +4481,9 @@ checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" [[package]] name = "rust-embed" -version = "8.3.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745" +checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -4489,22 +4492,22 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.3.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8" +checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.61", + "syn 2.0.63", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.3.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f69089032567ffff4eada41c573fc43ff466c7db7c5688b2e7969584345581" +checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" dependencies = [ "sha2", "walkdir", @@ -4575,7 +4578,7 @@ dependencies = [ "bytemuck", "libm", "smallvec", - "ttf-parser", + "ttf-parser 0.20.0", "unicode-bidi-mirroring", "unicode-ccc", "unicode-properties", @@ -4654,7 +4657,19 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", +] + +[[package]] +name = "serde_json" +version = "1.0.117" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", ] [[package]] @@ -4665,7 +4680,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -4830,9 +4845,9 @@ dependencies = [ [[package]] name = "smol_str" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" dependencies = [ "serde", ] @@ -4864,7 +4879,7 @@ source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#6e75b1ad7e9839 dependencies = [ "as-raw-xcb-connection", "bytemuck", - "cfg_aliases 0.2.0", + "cfg_aliases 0.2.1", "cocoa", "core-graphics", "drm", @@ -4966,9 +4981,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.61" +version = "2.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" +checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704" dependencies = [ "proc-macro2", "quote", @@ -5060,7 +5075,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -5080,7 +5095,7 @@ checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -5322,7 +5337,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -5385,6 +5400,12 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" +[[package]] +name = "ttf-parser" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" + [[package]] name = "type-map" version = "0.5.0" @@ -5413,18 +5434,18 @@ dependencies = [ [[package]] name = "unic-langid" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" +checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44" dependencies = [ "unic-langid-impl", ] [[package]] name = "unic-langid-impl" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" +checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5" dependencies = [ "serde", "tinystr", @@ -5625,9 +5646,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "walkdir" @@ -5666,7 +5687,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", "wasm-bindgen-shared", ] @@ -5700,7 +5721,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6086,7 +6107,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -6108,7 +6129,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -6590,7 +6611,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] diff --git a/src/dialog.rs b/src/dialog.rs index 47cc97e..11ef413 100644 --- a/src/dialog.rs +++ b/src/dialog.rs @@ -411,8 +411,9 @@ impl Application for App { Some(&self.nav_model) } - fn on_app_exit(&mut self) { + fn on_app_exit(&mut self) -> Option { self.result_opt = Some(DialogResult::Cancel); + None } fn on_nav_select(&mut self, entity: segmented_button::Entity) -> Command { @@ -791,10 +792,7 @@ impl Application for App { } } - //TODO: how to properly kill this task? - loop { - tokio::time::sleep(time::Duration::new(1, 0)).await; - } + std::future::pending().await }, ), self.tab.subscription().map(Message::TabMessage), diff --git a/src/tab.rs b/src/tab.rs index 65b0cbe..2bc64d0 100644 --- a/src/tab.rs +++ b/src/tab.rs @@ -292,7 +292,6 @@ pub fn scan_path(tab_path: &PathBuf, sizes: IconSizes) -> Vec { pos_opt: Cell::new(None), rect_opt: Cell::new(None), selected: false, - click_time: None, }); } } @@ -385,7 +384,6 @@ pub fn scan_trash(sizes: IconSizes) -> Vec { pos_opt: Cell::new(None), rect_opt: Cell::new(None), selected: false, - click_time: None, }); } } @@ -521,7 +519,6 @@ pub struct Item { pub pos_opt: Cell>, pub rect_opt: Cell>, pub selected: bool, - pub click_time: Option, } impl Item { @@ -769,7 +766,6 @@ impl Tab { continue; } item.selected = true; - item.click_time = None; } } } @@ -1275,7 +1271,6 @@ impl Tab { } else { item.selected = false; } - item.click_time = None; } } }