mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-20 13:21:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Propagate drag & drop events to ancestors

Browse Source
This commit is contained in:
Martín Capello 2024-09-18 16:58:54 -03:00
parent 9ae0416627
commit 573822d9f1
2 changed files with 26 additions and 6 deletions

31
src/ui/manager.cpp

@ -2041,10 +2041,24 @@ bool Manager::sendMessageToWidget(Message* msg, Widget* widget)
return used;
}
Widget* Manager::pickForDragAndDrop(const gfx::Point& pt)
{
Widget* widget = pick(pt);
// If widget doesn't support drag & drop, try to find the nearest ancestor
// that supports it.
while(widget && !widget->hasFlags(ALLOW_DROP))
widget = widget->parent();
return widget;
}
void Manager::dragEnter(os::DragEvent& ev)
{
Widget* widget = pick(ev.position());
if (widget && widget->hasFlags(ALLOW_DROP)) {
Widget* widget = pickForDragAndDrop(ev.position());
ASSERT(widget->hasFlags(ALLOW_DROP));
if (widget) {
m_dragOverWidget = widget;
DragEvent uiev(this, widget, ev);
widget->onDragEnter(uiev);
@ -2064,7 +2078,9 @@ void Manager::dragLeave(os::DragEvent& ev)
void Manager::drag(os::DragEvent& ev)
{
Widget* widget = pick(ev.position());
Widget* widget = pickForDragAndDrop(ev.position());
ASSERT(widget->hasFlags(ALLOW_DROP));
if (m_dragOverWidget && m_dragOverWidget != widget) {
DragEvent uiev(this, m_dragOverWidget, ev);
@ -2072,7 +2088,7 @@ void Manager::drag(os::DragEvent& ev)
m_dragOverWidget = nullptr;
}
if (widget && widget->hasFlags(ALLOW_DROP)) {
if (widget) {
DragEvent uiev(this, widget, ev);
if (m_dragOverWidget != widget) {
m_dragOverWidget = widget;
@ -2086,8 +2102,11 @@ void Manager::drag(os::DragEvent& ev)
void Manager::drop(os::DragEvent& ev)
{
m_dragOverWidget = nullptr;
Widget* widget = pick(ev.position());
if (widget && widget->hasFlags(ALLOW_DROP)) {
Widget* widget = pickForDragAndDrop(ev.position());
ASSERT(widget->hasFlags(ALLOW_DROP));
if (widget) {
DragEvent uiev(this, widget, ev);
widget->onDrop(uiev);
if (uiev.handled()) {

1
src/ui/manager.h

@ -163,6 +163,7 @@ namespace ui {
int pumpQueue();
bool sendMessageToWidget(Message* msg, Widget* widget);
Widget* pickForDragAndDrop(const gfx::Point& pt);
void dragEnter(os::DragEvent& ev) override;
void dragLeave(os::DragEvent& ev) override;
void drag(os::DragEvent& ev) override;