From 4a7c59b98760397d46e7be31b3d9405019561a75 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Fri, 31 May 2024 19:23:13 -0400 Subject: [PATCH] fix: DnD fixes --- Cargo.lock | 32 ++++++++++++++++---------------- src/mouse_area.rs | 10 +++++++--- src/tab.rs | 12 +++++++----- 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 062324c..b284093 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1094,7 +1094,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic.git#173ddca60fdb26cf5b1784edfc1a78594acf7002" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1113,7 +1113,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic.git#173ddca60fdb26cf5b1784edfc1a78594acf7002" dependencies = [ "quote", "syn 1.0.109", @@ -1186,7 +1186,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic.git#173ddca60fdb26cf5b1784edfc1a78594acf7002" dependencies = [ "almost", "cosmic-config", @@ -2592,7 +2592,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic.git#173ddca60fdb26cf5b1784edfc1a78594acf7002" dependencies = [ "dnd", "iced_accessibility", @@ -2610,7 +2610,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic.git#173ddca60fdb26cf5b1784edfc1a78594acf7002" dependencies = [ "accesskit", "accesskit_winit", @@ -2619,7 +2619,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic.git#173ddca60fdb26cf5b1784edfc1a78594acf7002" dependencies = [ "bitflags 2.5.0", "dnd", @@ -2639,7 +2639,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic.git#173ddca60fdb26cf5b1784edfc1a78594acf7002" dependencies = [ "futures", "iced_core", @@ -2652,7 +2652,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic.git#173ddca60fdb26cf5b1784edfc1a78594acf7002" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2676,7 +2676,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic.git#173ddca60fdb26cf5b1784edfc1a78594acf7002" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2688,7 +2688,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic.git#173ddca60fdb26cf5b1784edfc1a78594acf7002" dependencies = [ "dnd", "iced_core", @@ -2700,7 +2700,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic.git#173ddca60fdb26cf5b1784edfc1a78594acf7002" dependencies = [ "iced_core", "once_cell", @@ -2710,7 +2710,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic.git#173ddca60fdb26cf5b1784edfc1a78594acf7002" dependencies = [ "bytemuck", "cosmic-text", @@ -2727,7 +2727,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic.git#173ddca60fdb26cf5b1784edfc1a78594acf7002" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2753,7 +2753,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic.git#173ddca60fdb26cf5b1784edfc1a78594acf7002" dependencies = [ "dnd", "iced_renderer", @@ -2769,7 +2769,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic.git#173ddca60fdb26cf5b1784edfc1a78594acf7002" dependencies = [ "dnd", "iced_graphics", @@ -3117,7 +3117,7 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic.git#173ddca60fdb26cf5b1784edfc1a78594acf7002" dependencies = [ "apply", "ashpd", diff --git a/src/mouse_area.rs b/src/mouse_area.rs index 6d5e5ee..71a049e 100644 --- a/src/mouse_area.rs +++ b/src/mouse_area.rs @@ -388,11 +388,15 @@ where &self, state: &Tree, layout: Layout<'_>, + renderer: &Renderer, dnd_rectangles: &mut cosmic::iced_core::clipboard::DndDestinationRectangles, ) { - self.content - .as_widget() - .drag_destinations(&state.children[0], layout, dnd_rectangles); + self.content.as_widget().drag_destinations( + &state.children[0], + layout, + renderer, + dnd_rectangles, + ); } fn id(&self) -> Option { diff --git a/src/tab.rs b/src/tab.rs index 19f81c9..e362987 100644 --- a/src/tab.rs +++ b/src/tab.rs @@ -3138,13 +3138,15 @@ impl Widget for ArcElementWrapper { &self, _state: &tree::Tree, _layout: cosmic::iced_core::Layout<'_>, + renderer: &cosmic::Renderer, _dnd_rectangles: &mut cosmic::iced_core::clipboard::DndDestinationRectangles, ) { - self.0 - .lock() - .unwrap() - .as_widget() - .drag_destinations(_state, _layout, _dnd_rectangles) + self.0.lock().unwrap().as_widget().drag_destinations( + _state, + _layout, + renderer, + _dnd_rectangles, + ) } }