GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1125:3bc886701554

Improves drag&drop with spectro

trabillard -

r1125:3bc886701554

parent child

Context file:

r1125:3bc886701554

gui/src/Visualization/VisualizationDragDropContainer.cpp +5 -9

                          auto dragWidgetHovered = getChildDragWidgetAt(container, pos);
-                         if (canInsert && (isOnTop || isOnBottom || !canMerge)) {
-                             if (isOnBottom) {
+                         auto acceptMerge = m_AcceptDragWidgetFun(dragWidgetHovered, mimeData);
+                         if (canInsert && (isOnTop || isOnBottom || !canMerge || !acceptMerge)) {
+                             if (posY > (dropIndex + 1) * graphHeight - graphHeight / 2.0) {
                                  dropIndex += 1;
                              }
                                  helper.removePlaceHolder();
                              }
-                             if (m_AcceptDragWidgetFun(dragWidgetHovered, mimeData)) {
-                                 helper.setHightlightedDragWidget(dragWidgetHovered);
-                                 return true;
+                             }
-                             else {
-                                 return false;
+                             }
+                             helper.setHightlightedDragWidget(dragWidgetHovered);
                          }
                          else {
                              qCWarning(LOG_VisualizationDragDropContainer())

General Comments 4

trabillard

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

perrinel

|

Status change > Approved

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

	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