diff --git a/Cargo.lock b/Cargo.lock index 83663f9..70670b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1425,7 +1425,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic.git#529eeebaebb34890ce9ca54b5ee8bc4f5bbc0bd5" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1446,7 +1446,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic.git#529eeebaebb34890ce9ca54b5ee8bc4f5bbc0bd5" dependencies = [ "quote", "syn 2.0.106", @@ -1608,7 +1608,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic.git#529eeebaebb34890ce9ca54b5ee8bc4f5bbc0bd5" dependencies = [ "almost", "cosmic-config", @@ -3159,7 +3159,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic.git#529eeebaebb34890ce9ca54b5ee8bc4f5bbc0bd5" dependencies = [ "dnd", "iced_accessibility", @@ -3177,7 +3177,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic.git#529eeebaebb34890ce9ca54b5ee8bc4f5bbc0bd5" dependencies = [ "accesskit", "accesskit_winit", @@ -3186,7 +3186,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic.git#529eeebaebb34890ce9ca54b5ee8bc4f5bbc0bd5" dependencies = [ "bitflags 2.9.4", "bytes", @@ -3210,7 +3210,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic.git#529eeebaebb34890ce9ca54b5ee8bc4f5bbc0bd5" dependencies = [ "futures", "iced_core", @@ -3236,7 +3236,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic.git#529eeebaebb34890ce9ca54b5ee8bc4f5bbc0bd5" dependencies = [ "bitflags 2.9.4", "bytemuck", @@ -3258,7 +3258,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic.git#529eeebaebb34890ce9ca54b5ee8bc4f5bbc0bd5" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3270,7 +3270,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic.git#529eeebaebb34890ce9ca54b5ee8bc4f5bbc0bd5" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -3285,7 +3285,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic.git#529eeebaebb34890ce9ca54b5ee8bc4f5bbc0bd5" dependencies = [ "bytemuck", "cosmic-text", @@ -3301,7 +3301,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic.git#529eeebaebb34890ce9ca54b5ee8bc4f5bbc0bd5" dependencies = [ "as-raw-xcb-connection", "bitflags 2.9.4", @@ -3332,7 +3332,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic.git#529eeebaebb34890ce9ca54b5ee8bc4f5bbc0bd5" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3351,7 +3351,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic.git#529eeebaebb34890ce9ca54b5ee8bc4f5bbc0bd5" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -4436,7 +4436,7 @@ checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic.git#529eeebaebb34890ce9ca54b5ee8bc4f5bbc0bd5" dependencies = [ "apply", "ashpd 0.12.0", diff --git a/src/app.rs b/src/app.rs index 104bf13..ce12063 100644 --- a/src/app.rs +++ b/src/app.rs @@ -2158,7 +2158,7 @@ impl Application for App { compio_tx, context_page: ContextPage::Preview(None, PreviewKind::Selected), dialog_pages: DialogPages::new(), - dialog_text_input: widget::Id::unique(), + dialog_text_input: widget::Id::new("Dialog Text Input"), key_binds, margin: HashMap::new(), mime_app_cache: MimeAppCache::new(), @@ -2176,8 +2176,8 @@ impl Application for App { progress_operations: BTreeSet::new(), complete_operations: BTreeMap::new(), failed_operations: BTreeMap::new(), - scrollable_id: widget::Id::unique(), - search_id: widget::Id::unique(), + scrollable_id: widget::Id::new("File Scrollable"), + search_id: widget::Id::new("File Search"), size: None, #[cfg(all(feature = "wayland", feature = "desktop-applet"))] surface_ids: HashMap::new(), @@ -4636,7 +4636,7 @@ impl Application for App { id: surface_id, layer: Layer::Bottom, keyboard_interactivity: KeyboardInteractivity::OnDemand, - pointer_interactivity: true, + input_zone: None, anchor: Anchor::TOP | Anchor::BOTTOM | Anchor::LEFT | Anchor::RIGHT, output: IcedOutput::Output(output), namespace: "cosmic-files-applet".into(), @@ -5895,7 +5895,7 @@ impl Application for App { Some(Message::OutputEvent(output_event, output)) } #[cfg(feature = "desktop")] - WaylandEvent::OverlapNotify(event) => { + WaylandEvent::OverlapNotify(event, _, _) => { Some(Message::Overlap(window_id, event)) } _ => None, diff --git a/src/dialog.rs b/src/dialog.rs index a2af77e..f398ee1 100644 --- a/src/dialog.rs +++ b/src/dialog.rs @@ -978,15 +978,15 @@ impl Application for App { context_menu_window: None, context_page: ContextPage::Preview(None, PreviewKind::Selected), dialog_pages: VecDeque::new(), - dialog_text_input: widget::Id::unique(), + dialog_text_input: widget::Id::new("Dialog Text Input"), filters: Vec::new(), filter_selected: None, - filename_id: widget::Id::unique(), + filename_id: widget::Id::new("Dialog Filename"), modifiers: Modifiers::empty(), mounter_items: HashMap::new(), nav_model: segmented_button::ModelBuilder::default().build(), result_opt: None, - search_id: widget::Id::unique(), + search_id: widget::Id::new("Dialog File Search"), tab, key_binds, watcher_opt: None,