GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r912:9102bdac4611

Fix for D&D bug on mac

Thibaud Rabillard -

r912:9102bdac4611

parent child

Context file:

r912:9102bdac4611

gui/include/DragAndDrop/DragDropHelper.h +4 0

                  void setHightlightedDragWidget(VisualizationDragWidget *dragWidget);
                  VisualizationDragWidget *getHightlightedDragWidget() const;
+                 /// Delays the closing of a widget during a drag&drop operation
+                 void delayedCloseWidget(QWidget *widget);
+                 void doCloseWidgets();
              private:
                  class DragDropHelperPrivate;
                  spimpl::unique_impl_ptr<DragDropHelperPrivate> impl;

gui/src/DragAndDrop/DragDropHelper.cpp +17 0

                  QMetaObject::Connection m_DragWidgetDestroyedConnection;
                  QMetaObject::Connection m_HighlightedWidgetDestroyedConnection;
+                 QList<QWidget *> m_WidgetToClose;
                  explicit DragDropHelperPrivate()
                          : m_PlaceHolder{std::make_unique<QWidget>()},
                            m_DragDropScroller{std::make_unique<DragDropScroller>()},
                  return impl->m_HighlightedDragWidget;
              }
+             void DragDropHelper::delayedCloseWidget(QWidget *widget)
+             {
+                 widget->hide();
+                 impl->m_WidgetToClose << widget;
+             }
+             void DragDropHelper::doCloseWidgets()
+             {
+                 for (auto widget : impl->m_WidgetToClose) {
+                     widget->close();
+                 }
+                 impl->m_WidgetToClose.clear();
+             }
              bool DragDropHelper::checkMimeDataForVisualization(const QMimeData *mimeData,
                                                                 VisualizationDragDropContainer *dropContainer)
              {

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

                          // do not add the placeHolder
                      }
-                     // Note: The exec() is blocking on windows but not on linux and macOS
-                     drag->exec(Qt::MoveAction | Qt::CopyAction);
+                     drag->exec(Qt::MoveAction | Qt::CopyAction, Qt::MoveAction);
+                     helper.doCloseWidgets();
                  }
                  else {
                      qCWarning(LOG_VisualizationDragDropContainer())

gui/src/Visualization/VisualizationTabWidget.cpp +3 -3

                      if (nbGraph == 1) {
                          // This is the only graph in the previous zone, close the zone
-                         graphWidget->parentZoneWidget()->close();
+                         helper.delayedCloseWidget(graphWidget->parentZoneWidget());
                      }
                      else {
                          // Close the graph
-                         graphWidget->close();
+                         helper.delayedCloseWidget(graphWidget);
                      }
                      tabWidget->createZone(variables, index);
                      // Close the old zone if it was the only graph inside
                      if (nbGraph == 1) {
-                         parentZoneWidget->close();
+                         helper.delayedCloseWidget(parentZoneWidget);
                      }
                  }
              }

gui/src/Visualization/VisualizationZoneWidget.cpp +2 -2

                      auto nbGraph = parentDragDropContainer->countDragWidget();
                      if (nbGraph == 1) {
                          // This is the only graph in the previous zone, close the zone
-                         previousParentZoneWidget->close();
+                         helper.delayedCloseWidget(previousParentZoneWidget);
                      }
                      else {
                          // Close the graph
-                         graphWidget->close();
+                         helper.delayedCloseWidget(graphWidget);
                      }
                      // Creates the new graph in the zone

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