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

fix(dnd): leave event handlers should expect None as the drag Id

Browse source
This commit is contained in:
Ashley Wulber 2025-05-20 22:28:57 -04:00 • committed by Michael Murphy
parent a46483f161
commit ce56237ab9
3 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/widget/dnd_destination.rs
View file

@ -241,6 +241,11 @@ impl<'a, Message: 'static> DndDestination<'a, Message> {
Internal::Set(_) => panic!("Invalid Id assigned to dnd destination."),
}))
}
pub fn id(mut self, id: Id) -> Self {
self.id = id;
self
}
}
impl<Message: 'static> Widget<Message, crate::Theme, crate::Renderer>
@ -354,8 +359,12 @@ impl<Message: 'static> Widget<Message, crate::Theme, crate::Renderer>
}
return event::Status::Captured;
}
Event::Dnd(DndEvent::Offer(id, OfferEvent::Leave)) if id == Some(my_id) => {
state.on_leave(self.on_leave.as_ref().map(std::convert::AsRef::as_ref));
Event::Dnd(DndEvent::Offer(id, OfferEvent::Leave)) => {
if let Some(msg) =
state.on_leave(self.on_leave.as_ref().map(std::convert::AsRef::as_ref))
{
shell.publish(msg);
}
if self.forward_drag_as_cursor {
let drag_cursor = mouse::Cursor::Unavailable;
@ -403,7 +412,7 @@ impl<Message: 'static> Widget<Message, crate::Theme, crate::Renderer>
}
return event::Status::Captured;
}
Event::Dnd(DndEvent::Offer(id, OfferEvent::LeaveDestination)) if id == Some(my_id) => {
Event::Dnd(DndEvent::Offer(id, OfferEvent::LeaveDestination)) => {
if let Some(msg) =
state.on_leave(self.on_leave.as_ref().map(std::convert::AsRef::as_ref))
{