GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r880:7c654133459a

Improves reliability

trabillard -

r880:7c654133459a

parent child

Context file:

r880:7c654133459a

core/src/DataSource/DataSourceController.cpp +1 -1

             void DataSourceController::requestVariable(const QVariantHash &productData)
             {
-                DataSourceItem *sourceItem = impl->findDataSourceItem(productData);
+                auto sourceItem = impl->findDataSourceItem(productData);
                 if (sourceItem) {
                     auto sourceName = sourceItem->rootItem().name();

core/src/DataSource/DataSourceItem.cpp +2 -3

                         return child.get();
                     }
                     if (recursive) {
-                        auto foundItem = child->findItem(data, true);
+                        if (auto foundItem = child->findItem(data, true)) {
-                        if (foundItem) {
                             return foundItem;
                         }
                     }

core/src/Variable/VariableModel.cpp +1 -1

             bool VariableModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column,
                                              const QModelIndex &parent)
             {
-                bool dropDone = false;
+                auto dropDone = false;
                 if (data->hasFormat(MIME_TYPE_PRODUCT_LIST)) {
                     QDataStream stream(data->data(MIME_TYPE_PRODUCT_LIST));

gui/src/DragDropHelper.cpp +24 -2

                 VisualizationDragWidget *m_HighlightedDragWidget = nullptr;
+                QMetaObject::Connection m_DragWidgetDestroyedConnection;
+                QMetaObject::Connection m_HighlightedWidgetDestroyedConnection;
                 explicit DragDropHelperPrivate()
                         : m_PlaceHolder{std::make_unique<QWidget>()},
                           m_DragDropScroller{std::make_unique<DragDropScroller>()}
             void DragDropHelper::setCurrentDragWidget(VisualizationDragWidget *dragWidget)
             {
+                if (impl->m_CurrentDragWidget) {
+                    QObject::disconnect(impl->m_DragWidgetDestroyedConnection);
+                }
+                if (dragWidget) {
+                    // ensures the impl->m_CurrentDragWidget is reset when the widget is destroyed
+                    impl->m_DragWidgetDestroyedConnection
+                        = QObject::connect(dragWidget, &VisualizationDragWidget::destroyed,
+                                           [this]() { impl->m_CurrentDragWidget = nullptr; });
+                }
                 impl->m_CurrentDragWidget = dragWidget;
             }
             {
                 if (impl->m_HighlightedDragWidget) {
                     impl->m_HighlightedDragWidget->highlightForMerge(false);
+                    QObject::disconnect(impl->m_HighlightedWidgetDestroyedConnection);
                 }
                 if (dragWidget) {
-                    impl->m_HighlightedDragWidget = dragWidget;
+                    dragWidget->highlightForMerge(true);
-                    impl->m_HighlightedDragWidget->highlightForMerge(true);
+                    // ensures the impl->m_HighlightedDragWidget is reset when the widget is destroyed
+                    impl->m_DragWidgetDestroyedConnection
+                        = QObject::connect(dragWidget, &VisualizationDragWidget::destroyed,
+                                           [this]() { impl->m_HighlightedDragWidget = nullptr; });
                 }
+                impl->m_HighlightedDragWidget = dragWidget;
             }
             bool DragDropHelper::checkMimeDataForVisualization(const QMimeData *mimeData,

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

                 bool cursorIsInContainer(QWidget *container) const
                 {
-                    auto adustNum = 18; // to be safe, in case of scrollbar on the side
+                    return container->isAncestorOf(sqpApp->widgetAt(QCursor::pos()));
-                    auto containerRect = QRect(QPoint(), container->contentsRect().size())
-                                             .adjusted(adustNum, adustNum, -adustNum, -adustNum);
-                    return containerRect.contains(container->mapFromGlobal(QCursor::pos()));
                 }
                 int countDragWidget(const QWidget *parent) const
                         helper.insertPlaceHolder(impl->m_Layout, dragWidgetIndex);
                         dragWidget->setVisible(false);
                     }
+                    else {
+                        // The drag starts directly outside the drop zone
+                        // do not add the placeHolder
+                    }
                     // Note: The exec() is blocking on windows but not on linux and macOS
                     drag->exec(Qt::MoveAction | Qt::CopyAction);

General Comments 3

trabillard

|

Pull request updated. Auto status change to "Under Review"

Changed commits:
  * 1 added
  * 0 removed

Changed files:
  * A core/tests/meson.build

Write
Preview

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

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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