GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r883:4dce99ba7a36

Reset of the drag&drop operations when a drag is started from the datasource or from the variables

trabillard -

r883:4dce99ba7a36

parent child

Context file:

r883:4dce99ba7a36

gui/include/Variable/VariableInspectorTableView.h created 644 +14 0

@@ -0,0 +1,14
	1	#ifndef SCIQLOP_VARIABLEINSPECTORTABLEVIEW_H
	2	#define SCIQLOP_VARIABLEINSPECTORTABLEVIEW_H
	3
	4	#include <QTableView>
	5
	6	class VariableInspectorTableView : public QTableView {
	7	public:
	8	VariableInspectorTableView(QWidget *parent = nullptr);
	9
	10	protected:
	11	void startDrag(Qt::DropActions supportedActions);
	12	};
	13
	14	#endif // SCIQLOP_VARIABLEINSPECTORTABLEVIEW_H

gui/src/Variable/VariableInspectorTableView.cpp created 644 +13 0

@@ -0,0 +1,13
	1	#include "Variable/VariableInspectorTableView.h"
	2
	3	#include "DragDropHelper.h"
	4	#include "SqpApplication.h"
	5
	6	VariableInspectorTableView::VariableInspectorTableView(QWidget *parent) : QTableView(parent) {}
	7
	8	void VariableInspectorTableView::startDrag(Qt::DropActions supportedActions)
	9	{
	10	// Resets the drag&drop operations before it's starting
	11	sqpApp->dragDropHelper().resetDragAndDrop();
	12	QTableView::startDrag(supportedActions);
	13	}

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

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

gui/include/DataSource/DataSourceTreeWidget.h +1 0

             protected:
                 QMimeData *mimeData(const QList<QTreeWidgetItem *> items) const override;
+                void startDrag(Qt::DropActions supportedActions) override;
             };
             #endif // SCIQLOP_DATASOURCETREEWIDGET_H

gui/meson.build +2 0

               'include/DragDropHelper.h',
               'include/TimeWidget/TimeWidget.h',
               'include/Variable/VariableInspectorWidget.h',
+              'include/Variable/VariableInspectorTableView.h',
               'include/Variable/RenameVariableDialog.h',
               'include/Visualization/qcustomplot.h',
               'include/Visualization/VisualizationGraphWidget.h',
               'src/SidePane/SqpSidePane.cpp',
               'src/TimeWidget/TimeWidget.cpp',
               'src/Variable/VariableInspectorWidget.cpp',
+              'src/Variable/VariableInspectorTableView.cpp',
               'src/Variable/VariableMenuHeaderWidget.cpp',
               'src/Variable/RenameVariableDialog.cpp',
               'src/Visualization/VisualizationGraphHelper.cpp',

gui/src/DataSource/DataSourceTreeWidget.cpp +8 0

             #include "DataSource/DataSourceItem.h"
             #include "DataSource/DataSourceTreeWidgetItem.h"
+            #include "DragDropHelper.h"
             #include "SqpApplication.h"
             #include <QMimeData>
                 return mimeData;
             }
+            void DataSourceTreeWidget::startDrag(Qt::DropActions supportedActions)
+            {
+                // Resets the drag&drop operations before it's starting
+                sqpApp->dragDropHelper().resetDragAndDrop();
+                QTreeWidget::startDrag(supportedActions);
+            }

gui/src/Variable/VariableInspectorWidget.cpp 0 -5

                 ui->tableView->setContextMenuPolicy(Qt::CustomContextMenu);
                 connect(ui->tableView, &QTableView::customContextMenuRequested, this,
                         &VariableInspectorWidget::onTableMenuRequested);
-                // Resets the drag&drop operation on a left-click (the drag&drop is also started by a left
-                // click).
-                connect(ui->tableView, &QTableView::clicked,
-                        [](const auto &modelIndex) { sqpApp->dragDropHelper().resetDragAndDrop(); });
             }
             VariableInspectorWidget::~VariableInspectorWidget()

gui/ui/Variable/VariableInspectorWidget.ui +8 -1

               </property>
               <layout class="QGridLayout" name="gridLayout">
                <item row="0" column="0">
-                <widget class="QTableView" name="tableView">
+                <widget class="VariableInspectorTableView" name="tableView">
                  <property name="acceptDrops">
                   <bool>true</bool>
                  </property>
                </item>
               </layout>
              </widget>
+             <customwidgets>
+              <customwidget>
+               <class>VariableInspectorTableView</class>
+               <extends>QTableView</extends>
+               <header>Variable/VariableInspectorTableView.h</header>
+              </customwidget>
+             </customwidgets>
              <resources/>
              <connections/>
             </ui>

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

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