leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: DnD fixes

Browse source
This commit is contained in:
Ashley Wulber 2024-05-31 19:23:13 -04:00 • committed by Jeremy Soller
parent 6d8dbb398e
commit 4a7c59b987
3 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Cargo.lock generated
View file

@ -1094,7 +1094,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config" name = "cosmic-config"
version = "0.1.0" 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 = [ dependencies = [
"atomicwrites", "atomicwrites",
"cosmic-config-derive", "cosmic-config-derive",
@ -1113,7 +1113,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config-derive" name = "cosmic-config-derive"
version = "0.1.0" 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 = [ dependencies = [
"quote", "quote",
"syn 1.0.109", "syn 1.0.109",
@ -1186,7 +1186,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-theme" name = "cosmic-theme"
version = "0.1.0" 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 = [ dependencies = [
"almost", "almost",
"cosmic-config", "cosmic-config",
@ -2592,7 +2592,7 @@ dependencies = [
[[package]] [[package]]
name = "iced" name = "iced"
version = "0.12.0" 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 = [ dependencies = [
"dnd", "dnd",
"iced_accessibility", "iced_accessibility",
@ -2610,7 +2610,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_accessibility" name = "iced_accessibility"
version = "0.1.0" 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 = [ dependencies = [
"accesskit", "accesskit",
"accesskit_winit", "accesskit_winit",
@ -2619,7 +2619,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_core" name = "iced_core"
version = "0.12.0" 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 = [ dependencies = [
"bitflags 2.5.0", "bitflags 2.5.0",
"dnd", "dnd",
@ -2639,7 +2639,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_futures" name = "iced_futures"
version = "0.12.0" 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 = [ dependencies = [
"futures", "futures",
"iced_core", "iced_core",
@ -2652,7 +2652,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_graphics" name = "iced_graphics"
version = "0.12.0" 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 = [ dependencies = [
"bitflags 2.5.0", "bitflags 2.5.0",
"bytemuck", "bytemuck",
@ -2676,7 +2676,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_renderer" name = "iced_renderer"
version = "0.12.0" 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 = [ dependencies = [
"iced_graphics", "iced_graphics",
"iced_tiny_skia", "iced_tiny_skia",
@ -2688,7 +2688,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_runtime" name = "iced_runtime"
version = "0.12.0" 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 = [ dependencies = [
"dnd", "dnd",
"iced_core", "iced_core",
@ -2700,7 +2700,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_style" name = "iced_style"
version = "0.12.0" 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 = [ dependencies = [
"iced_core", "iced_core",
"once_cell", "once_cell",
@ -2710,7 +2710,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_tiny_skia" name = "iced_tiny_skia"
version = "0.12.0" 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 = [ dependencies = [
"bytemuck", "bytemuck",
"cosmic-text", "cosmic-text",
@ -2727,7 +2727,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_wgpu" name = "iced_wgpu"
version = "0.12.0" 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 = [ dependencies = [
"bitflags 2.5.0", "bitflags 2.5.0",
"bytemuck", "bytemuck",
@ -2753,7 +2753,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_widget" name = "iced_widget"
version = "0.12.0" 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 = [ dependencies = [
"dnd", "dnd",
"iced_renderer", "iced_renderer",
@ -2769,7 +2769,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_winit" name = "iced_winit"
version = "0.12.0" 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 = [ dependencies = [
"dnd", "dnd",
"iced_graphics", "iced_graphics",
@ -3117,7 +3117,7 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
[[package]] [[package]]
name = "libcosmic" name = "libcosmic"
version = "0.1.0" 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 = [ dependencies = [
"apply", "apply",
"ashpd", "ashpd",

10
src/mouse_area.rs
View file

@ -388,11 +388,15 @@ where
&self, &self,
state: &Tree, state: &Tree,
layout: Layout<'_>, layout: Layout<'_>,
renderer: &Renderer,
dnd_rectangles: &mut cosmic::iced_core::clipboard::DndDestinationRectangles, dnd_rectangles: &mut cosmic::iced_core::clipboard::DndDestinationRectangles,
) { ) {
self.content self.content.as_widget().drag_destinations(
.as_widget() &state.children[0],
.drag_destinations(&state.children[0], layout, dnd_rectangles); layout,
renderer,
dnd_rectangles,
);
} }
fn id(&self) -> Option<Id> { fn id(&self) -> Option<Id> {

12
src/tab.rs
View file

@ -3138,13 +3138,15 @@ impl<M> Widget<M, cosmic::Theme, cosmic::Renderer> for ArcElementWrapper<M> {
&self, &self,
_state: &tree::Tree, _state: &tree::Tree,
_layout: cosmic::iced_core::Layout<'_>, _layout: cosmic::iced_core::Layout<'_>,
renderer: &cosmic::Renderer,
_dnd_rectangles: &mut cosmic::iced_core::clipboard::DndDestinationRectangles, _dnd_rectangles: &mut cosmic::iced_core::clipboard::DndDestinationRectangles,
) { ) {
self.0 self.0.lock().unwrap().as_widget().drag_destinations(
.lock() _state,
.unwrap() _layout,
.as_widget() renderer,
.drag_destinations(_state, _layout, _dnd_rectangles) _dnd_rectangles,
)
} }
} }