GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r979:a300a0876631

fix some wrong drag&drop behavior appearing on mac

trabillard -

r979:a300a0876631

parent child

Context file:

r979:a300a0876631

gui/src/Visualization/VisualizationDragDropContainer.cpp +4 -2

                 bool cursorIsInContainer(QWidget *container) const
                 {
-                    return container->isAncestorOf(sqpApp->widgetAt(QCursor::pos()));
+                    auto widgetUnderMouse = sqpApp->widgetAt(QCursor::pos());
+                    return container->isAncestorOf(widgetUnderMouse) && widgetUnderMouse != container
+                           && sqpApp->dragDropHelper().placeHolder().isAncestorOf(widgetUnderMouse);
                 }
                 int countDragWidget(const QWidget *parent, bool onlyVisible = false) const
                 auto &helper = sqpApp->dragDropHelper();
                 auto absPos = container->mapToGlobal(pos);
-                auto isOnPlaceHolder = sqpApp->widgetAt(absPos) == &(helper.placeHolder());
+                auto isOnPlaceHolder = helper.placeHolder().isAncestorOf(sqpApp->widgetAt(absPos));
                 if (countDragWidget(container, true) == 0) {
                     // Drop on an empty container, just add the placeHolder at the top

General Comments 1

trabillard

|

Auto status change to "Under Review"

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages