From 5dff3418adfaad536d4a65976f4ca04df2284619 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 20 Sep 2024 09:24:03 -0600 Subject: [PATCH] Update dependencies --- Cargo.lock | 107 ++++++++++++++++++++++++++-------------------------- src/menu.rs | 2 +- src/tab.rs | 43 +++++++++++---------- 3 files changed, 77 insertions(+), 75 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3797c0a..b4ebba4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -254,9 +254,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.88" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "apply" @@ -290,9 +290,9 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayref" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" @@ -519,9 +519,9 @@ dependencies = [ [[package]] name = "async-process" -version = "2.2.4" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" dependencies = [ "async-channel", "async-io 2.3.4", @@ -534,7 +534,6 @@ dependencies = [ "futures-lite 2.3.0", "rustix 0.38.37", "tracing", - "windows-sys 0.59.0", ] [[package]] @@ -835,9 +834,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bzip2" @@ -914,9 +913,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.18" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" dependencies = [ "jobserver", "libc", @@ -1213,7 +1212,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f942977703404e43ade60080f14d61e7aa078733" +source = "git+https://github.com/pop-os/libcosmic.git#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1232,7 +1231,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f942977703404e43ade60080f14d61e7aa078733" +source = "git+https://github.com/pop-os/libcosmic.git#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "quote", "syn 1.0.109", @@ -1341,7 +1340,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f942977703404e43ade60080f14d61e7aa078733" +source = "git+https://github.com/pop-os/libcosmic.git#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "almost", "cosmic-config", @@ -2075,7 +2074,7 @@ checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" dependencies = [ "fontconfig-parser", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "slotmap", "tinyvec", "ttf-parser 0.20.0", @@ -2760,9 +2759,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2784,7 +2783,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f942977703404e43ade60080f14d61e7aa078733" +source = "git+https://github.com/pop-os/libcosmic.git#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "dnd", "iced_accessibility", @@ -2803,7 +2802,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f942977703404e43ade60080f14d61e7aa078733" +source = "git+https://github.com/pop-os/libcosmic.git#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "accesskit", "accesskit_unix", @@ -2813,7 +2812,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f942977703404e43ade60080f14d61e7aa078733" +source = "git+https://github.com/pop-os/libcosmic.git#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "bitflags 2.6.0", "dnd", @@ -2835,7 +2834,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f942977703404e43ade60080f14d61e7aa078733" +source = "git+https://github.com/pop-os/libcosmic.git#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "futures", "iced_core", @@ -2848,7 +2847,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f942977703404e43ade60080f14d61e7aa078733" +source = "git+https://github.com/pop-os/libcosmic.git#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -2872,7 +2871,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f942977703404e43ade60080f14d61e7aa078733" +source = "git+https://github.com/pop-os/libcosmic.git#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2884,7 +2883,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f942977703404e43ade60080f14d61e7aa078733" +source = "git+https://github.com/pop-os/libcosmic.git#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "dnd", "iced_accessibility", @@ -2898,7 +2897,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f942977703404e43ade60080f14d61e7aa078733" +source = "git+https://github.com/pop-os/libcosmic.git#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "enum-repr", "float-cmp", @@ -2925,7 +2924,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f942977703404e43ade60080f14d61e7aa078733" +source = "git+https://github.com/pop-os/libcosmic.git#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "iced_core", "once_cell", @@ -2935,7 +2934,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f942977703404e43ade60080f14d61e7aa078733" +source = "git+https://github.com/pop-os/libcosmic.git#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "bytemuck", "cosmic-text", @@ -2952,7 +2951,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f942977703404e43ade60080f14d61e7aa078733" +source = "git+https://github.com/pop-os/libcosmic.git#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "as-raw-xcb-connection", "bitflags 2.6.0", @@ -2981,7 +2980,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f942977703404e43ade60080f14d61e7aa078733" +source = "git+https://github.com/pop-os/libcosmic.git#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "dnd", "iced_accessibility", @@ -2999,7 +2998,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f942977703404e43ade60080f14d61e7aa078733" +source = "git+https://github.com/pop-os/libcosmic.git#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "dnd", "iced_accessibility", @@ -3515,7 +3514,7 @@ checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f942977703404e43ade60080f14d61e7aa078733" +source = "git+https://github.com/pop-os/libcosmic.git#a962865230f3b9ecba40c0c09e9c279e832c9f10" dependencies = [ "apply", "ashpd 0.9.1", @@ -3575,7 +3574,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -3804,9 +3803,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -4655,7 +4654,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.22.20", + "toml_edit 0.22.21", ] [[package]] @@ -5167,7 +5166,7 @@ checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7" dependencies = [ "ab_glyph", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "smithay-client-toolkit 0.18.1", "tiny-skia", ] @@ -5353,7 +5352,7 @@ dependencies = [ "cursor-icon", "libc", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "rustix 0.38.37", "thiserror", "wayland-backend", @@ -5379,7 +5378,7 @@ dependencies = [ "cursor-icon", "libc", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "pkg-config", "rustix 0.38.37", "thiserror", @@ -5449,7 +5448,7 @@ dependencies = [ "foreign-types", "js-sys", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "objc", "raw-window-handle", "redox_syscall 0.4.1", @@ -5897,7 +5896,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.20", + "toml_edit 0.22.21", ] [[package]] @@ -5922,9 +5921,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.20" +version = "0.22.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" dependencies = [ "indexmap", "serde", @@ -6125,9 +6124,9 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] @@ -6140,15 +6139,15 @@ checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" [[package]] name = "unicode-script" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" +checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-vo" @@ -6158,15 +6157,15 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "unix_permissions_ext" @@ -7098,7 +7097,7 @@ dependencies = [ "js-sys", "libc", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "ndk", "ndk-sys", "objc2 0.4.1", @@ -7368,7 +7367,7 @@ dependencies = [ "async-fs 2.1.2", "async-io 2.3.4", "async-lock 3.4.0", - "async-process 2.2.4", + "async-process 2.3.0", "async-recursion", "async-task", "async-trait", diff --git a/src/menu.rs b/src/menu.rs index 3fbd50c..d02976b 100644 --- a/src/menu.rs +++ b/src/menu.rs @@ -22,7 +22,7 @@ use crate::{ macro_rules! menu_button { ($($x:expr),+ $(,)?) => ( - button( + button::custom( Row::with_children( vec![$(Element::from($x)),+] ) diff --git a/src/tab.rs b/src/tab.rs index 18b8bba..7f340ad 100644 --- a/src/tab.rs +++ b/src/tab.rs @@ -1003,7 +1003,7 @@ impl Item { if let Some(Location::Path(path)) = &self.location_opt { for app in self.open_with.iter() { column = column.push( - widget::button( + widget::button::custom( widget::row::with_children(vec![ widget::icon(app.icon.clone()).into(), if app.is_default { @@ -2440,7 +2440,7 @@ impl Tab { let mut w = 0.0; let mut prev_button = - widget::button(widget::icon::from_name("go-previous-symbolic").size(16)) + widget::button::custom(widget::icon::from_name("go-previous-symbolic").size(16)) .padding(space_xxs) .style(theme::Button::Icon); if self.history_i > 0 && !self.history.is_empty() { @@ -2449,9 +2449,10 @@ impl Tab { row = row.push(prev_button); w += 16.0 + 2.0 * space_xxs as f32; - let mut next_button = widget::button(widget::icon::from_name("go-next-symbolic").size(16)) - .padding(space_xxs) - .style(theme::Button::Icon); + let mut next_button = + widget::button::custom(widget::icon::from_name("go-next-symbolic").size(16)) + .padding(space_xxs) + .style(theme::Button::Icon); if self.history_i + 1 < self.history.len() { next_button = next_button.on_press(Message::GoNext); } @@ -2507,10 +2508,12 @@ impl Tab { match location { Location::Path(path) => { row = row.push( - widget::button(widget::icon::from_name("window-close-symbolic").size(16)) - .on_press(Message::EditLocation(None)) - .padding(space_xxs) - .style(theme::Button::Icon), + widget::button::custom( + widget::icon::from_name("window-close-symbolic").size(16), + ) + .on_press(Message::EditLocation(None)) + .padding(space_xxs) + .style(theme::Button::Icon), ); row = row.push( widget::text_input("", path.to_string_lossy()) @@ -2544,7 +2547,7 @@ impl Tab { } else if let Location::Path(path) = &self.location { row = row.push( crate::mouse_area::MouseArea::new( - widget::button(widget::icon::from_name("edit-symbolic").size(16)) + widget::button::custom(widget::icon::from_name("edit-symbolic").size(16)) .padding(space_xxs) .style(theme::Button::Icon) .on_press(Message::EditLocation(Some(self.location.clone()))), @@ -2554,7 +2557,7 @@ impl Tab { w += 16.0 + 2.0 * space_xxs as f32; } else if let Location::Search(_, term) = &self.location { row = row.push( - widget::button( + widget::button::custom( widget::row::with_children(vec![ widget::icon::from_name("system-search-symbolic") .size(16) @@ -2621,7 +2624,7 @@ impl Tab { }; let mut mouse_area = crate::mouse_area::MouseArea::new( - widget::button(row) + widget::button::custom(row) .padding(space_xxxs) .style(theme::Button::Link) .on_press(Message::Location(location.clone())), @@ -2654,7 +2657,7 @@ impl Tab { } Location::Trash => { children.push( - widget::button(widget::text::heading(fl!("trash"))) + widget::button::custom(widget::text::heading(fl!("trash"))) .padding(space_xxxs) .on_press(Message::Location(Location::Trash)) .style(theme::Button::Text) @@ -2663,7 +2666,7 @@ impl Tab { } Location::Recents => { children.push( - widget::button(widget::text::heading(fl!("recents"))) + widget::button::custom(widget::text::heading(fl!("recents"))) .padding(space_xxxs) .on_press(Message::Location(Location::Recents)) .style(theme::Button::Text) @@ -2672,7 +2675,7 @@ impl Tab { } Location::Network(uri, display_name) => { children.push( - widget::button(widget::text::heading(display_name)) + widget::button::custom(widget::text::heading(display_name)) .padding(space_xxxs) .on_press(Message::Location(Location::Network( uri.clone(), @@ -2843,14 +2846,14 @@ impl Tab { //TODO: one focus group per grid item (needs custom widget) let buttons = vec![ - widget::button( + widget::button::custom( widget::icon::icon(item.icon_handle_grid.clone()) .content_fit(ContentFit::Contain) .size(icon_sizes.grid()), ) .padding(space_xxxs) .style(button_style(item.selected, false, false, false)), - widget::button(widget::text::body(&item.display_name)) + widget::button::custom(widget::text::body(&item.display_name)) .id(item.button_id.clone()) .padding([0, space_xxxs]) .style(button_style( @@ -2983,7 +2986,7 @@ impl Tab { }; if *row == r && *col == c { let buttons = vec![ - widget::button( + widget::button::custom( widget::icon::icon(item.icon_handle_grid.clone()) .content_fit(ContentFit::Contain) .size(icon_sizes.grid()), @@ -2996,7 +2999,7 @@ impl Tab { false, false, )), - widget::button(widget::text(item.display_name.clone())) + widget::button::custom(widget::text(item.display_name.clone())) .id(item.button_id.clone()) .on_press(Message::Click(Some(*i))) .padding([0, space_xxxs]) @@ -3211,7 +3214,7 @@ impl Tab { let button = |row| { let mouse_area = crate::mouse_area::MouseArea::new( - widget::button(row) + widget::button::custom(row) .width(Length::Fill) .id(item.button_id.clone()) .padding([0, space_xxs])