leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: refactor dnd impl to support responsive widget

Browse source
This commit is contained in:
Ashley Wulber 2024-05-31 19:10:51 -04:00 • committed by Ashley Wulber
parent 9af083e0c5
commit 173ddca60f
12 changed files with 61 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
iced

@ -1 +1 @@
Subproject commit 34973a56d512d11c1c3c343e2cb5c4c979d15e9c
Subproject commit 9ce8c6becc655be8448bbf069421ae2ddab1a18c

10
src/widget/context_drawer/widget.rs
View file

@ -247,11 +247,15 @@ impl<'a, Message: Clone> Widget<Message, crate::Theme, Renderer> for ContextDraw
&self,
state: &Tree,
layout: Layout<'_>,
renderer: &Renderer,
dnd_rectangles: &mut 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<iced_core::widget::Id> {

10
src/widget/dnd_destination.rs
View file

@ -506,6 +506,7 @@ impl<'a, Message: 'static> Widget<Message, crate::Theme, crate::Renderer>
&self,
state: &Tree,
layout: layout::Layout<'_>,
renderer: &crate::Renderer,
dnd_rectangles: &mut iced_core::clipboard::DndDestinationRectangles,
) {
let bounds = layout.bounds();
@ -524,9 +525,12 @@ impl<'a, Message: 'static> Widget<Message, crate::Theme, crate::Renderer>
};
dnd_rectangles.push(my_dest);
self.container
.as_widget()
.drag_destinations(&state.children[0], layout, dnd_rectangles);
self.container.as_widget().drag_destinations(
&state.children[0],
layout,
renderer,
dnd_rectangles,
);
}
fn id(&self) -> Option<Id> {

25
src/widget/dnd_source.rs
View file

@ -1,3 +1,5 @@
use std::any::Any;
use crate::{
iced::{
clipboard::dnd::{DndAction, DndEvent, SourceEvent},
@ -167,9 +169,12 @@ impl<
iced_core::widget::OperationOutputWrapper<Message>,
>,
) {
self.container
.as_widget()
.operate(&mut tree.children[0], layout, renderer, operation);
operation.custom((&mut tree.state) as &mut dyn Any, Some(&self.id));
operation.container(Some(&self.id), layout.bounds(), &mut |operation| {
self.container
.as_widget()
.operate(&mut tree.children[0], layout, renderer, operation)
});
}
fn on_event(
@ -205,6 +210,7 @@ impl<
}
state.left_pressed_position = Some(position);
// dbg!(&state, &self.id);
return event::Status::Captured;
}
}
@ -223,6 +229,7 @@ impl<
return ret;
}
if let Some(left_pressed_position) = state.left_pressed_position {
// dbg!(&state);
if position.distance(left_pressed_position) > self.drag_threshold {
self.start_dnd(clipboard, state.cached_bounds);
state.is_dragging = true;
@ -311,11 +318,15 @@ impl<
&self,
state: &Tree,
layout: layout::Layout<'_>,
renderer: &crate::Renderer,
dnd_rectangles: &mut iced_style::core::clipboard::DndDestinationRectangles,
) {
self.container
.as_widget()
.drag_destinations(&state.children[0], layout, dnd_rectangles);
self.container.as_widget().drag_destinations(
&state.children[0],
layout,
renderer,
dnd_rectangles,
);
}
fn id(&self) -> Option<Id> {
@ -340,7 +351,7 @@ impl<
}
/// Local state of the [`MouseListener`].
#[derive(Default)]
#[derive(Debug, Default)]
struct State {
hovered: bool,
left_pressed_position: Option<Point>,

3
src/widget/flex_row/widget.rs
View file

@ -251,6 +251,7 @@ impl<'a, Message: 'static + Clone> Widget<Message, crate::Theme, Renderer>
&self,
state: &Tree,
layout: Layout<'_>,
renderer: &Renderer,
dnd_rectangles: &mut iced_style::core::clipboard::DndDestinationRectangles,
) {
for ((e, layout), state) in self
@ -260,7 +261,7 @@ impl<'a, Message: 'static + Clone> Widget<Message, crate::Theme, Renderer>
.zip(state.children.iter())
{
e.as_widget()
.drag_destinations(state, layout, dnd_rectangles);
.drag_destinations(state, layout, renderer, dnd_rectangles);
}
}
}

3
src/widget/grid/widget.rs
View file

@ -273,6 +273,7 @@ impl<'a, Message: 'static + Clone> Widget<Message, crate::Theme, Renderer> for G
&self,
state: &Tree,
layout: Layout<'_>,
renderer: &Renderer,
dnd_rectangles: &mut iced_style::core::clipboard::DndDestinationRectangles,
) {
for ((e, layout), state) in self
@ -282,7 +283,7 @@ impl<'a, Message: 'static + Clone> Widget<Message, crate::Theme, Renderer> for G
.zip(state.children.iter())
{
e.as_widget()
.drag_destinations(state, layout, dnd_rectangles);
.drag_destinations(state, layout, renderer, dnd_rectangles);
}
}
}

2
src/widget/header_bar.rs
View file

@ -243,6 +243,7 @@ impl<'a, Message: Clone + 'static> Widget<Message, crate::Theme, crate::Renderer
&self,
state: &tree::Tree,
layout: iced_core::Layout<'_>,
renderer: &crate::Renderer,
dnd_rectangles: &mut iced_style::core::clipboard::DndDestinationRectangles,
) {
if let Some((child_tree, child_layout)) =
@ -251,6 +252,7 @@ impl<'a, Message: Clone + 'static> Widget<Message, crate::Theme, crate::Renderer
self.header_bar_inner.as_widget().drag_destinations(
child_tree,
child_layout,
renderer,
dnd_rectangles,
);
}

16
src/widget/id_container.rs
View file

@ -87,12 +87,14 @@ where
iced_core::widget::OperationOutputWrapper<Message>,
>,
) {
self.content.as_widget().operate(
&mut tree.children[0],
layout.children().next().unwrap(),
renderer,
operation,
);
operation.container(Some(&self.id), layout.bounds(), &mut |operation| {
self.content.as_widget().operate(
&mut tree.children[0],
layout.children().next().unwrap(),
renderer,
operation,
);
});
}
fn on_event(
@ -175,12 +177,14 @@ where
&self,
state: &Tree,
layout: Layout<'_>,
renderer: &Renderer,
dnd_rectangles: &mut iced_style::core::clipboard::DndDestinationRectangles,
) {
let content_layout = layout.children().next().unwrap();
self.content.as_widget().drag_destinations(
&state.children[0],
content_layout,
renderer,
dnd_rectangles,
);
}

3
src/widget/layer_container.rs
View file

@ -256,10 +256,11 @@ where
&self,
state: &Tree,
layout: Layout<'_>,
renderer: &Renderer,
dnd_rectangles: &mut iced_style::core::clipboard::DndDestinationRectangles,
) {
self.container
.drag_destinations(state, layout, dnd_rectangles);
.drag_destinations(state, layout, renderer, dnd_rectangles);
}
fn id(&self) -> Option<crate::widget::Id> {

10
src/widget/popover.rs
View file

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

3
src/widget/rectangle_tracker/mod.rs
View file

@ -296,10 +296,11 @@ where
&self,
state: &Tree,
layout: Layout<'_>,
renderer: &Renderer,
dnd_rectangles: &mut iced_style::core::clipboard::DndDestinationRectangles,
) {
self.container
.drag_destinations(state, layout, dnd_rectangles);
.drag_destinations(state, layout, renderer, dnd_rectangles);
}
}

1
src/widget/segmented_button/widget.rs
View file

@ -1529,6 +1529,7 @@ where
&self,
_state: &Tree,
layout: Layout<'_>,
_renderer: &Renderer,
dnd_rectangles: &mut iced_core::clipboard::DndDestinationRectangles,
) {
let bounds = layout.bounds();