GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r886:4ed691514436

Fix some glitches which occurred when dragging in the visualization something from the sides.

trabillard -

r886:4ed691514436

parent child

Context file:

r886:4ed691514436

gui/include/Visualization/VisualizationDragDropContainer.h +2 -2

             #define SCIQLOP_VISUALIZATIONDRAGDROPCONTAINER_H
             #include <Common/spimpl.h>
+            #include <QFrame>
             #include <QLoggingCategory>
             #include <QMimeData>
             #include <QVBoxLayout>
-            #include <QWidget>
             #include <functional>
             class VisualizationDragWidget;
-            class VisualizationDragDropContainer : public QWidget {
+            class VisualizationDragDropContainer : public QFrame {
                 Q_OBJECT
             signals:

gui/src/Visualization/VisualizationDragDropContainer.cpp +24 -17

                     return container->isAncestorOf(sqpApp->widgetAt(QCursor::pos()));
                 }
-                int countDragWidget(const QWidget *parent) const
+                int countDragWidget(const QWidget *parent, bool onlyVisible = false) const
                 {
                     auto nbGraph = 0;
                     for (auto child : parent->children()) {
                         if (qobject_cast<VisualizationDragWidget *>(child)) {
-                            nbGraph += 1;
+                            if (!onlyVisible || qobject_cast<VisualizationDragWidget *>(child)->isVisible()) {
+                                nbGraph += 1;
+                            }
                         }
                     }
             };
             VisualizationDragDropContainer::VisualizationDragDropContainer(QWidget *parent)
-                    : QWidget{parent},
+                    : QFrame{parent},
                       impl{spimpl::make_unique_impl<VisualizationDragDropContainerPrivate>(this)}
             {
                 setAcceptDrops(true);
             {
                 auto &helper = sqpApp->dragDropHelper();
-                auto dragWidgetHovered = getChildDragWidgetAt(container, pos);
+                auto absPos = container->mapToGlobal(pos);
-                if (dragWidgetHovered) {
+                auto isOnPlaceHolder = sqpApp->widgetAt(absPos) == &(helper.placeHolder());
+                if (countDragWidget(container, true) == 0) {
+                    // Drop on an empty container, just add the placeHolder at the top
+                    helper.insertPlaceHolder(m_Layout, 0);
+                }
+                else if (!isOnPlaceHolder) {
                     auto nbDragWidget = countDragWidget(container);
                     if (nbDragWidget > 0) {
                         auto placeHolderIndex = m_Layout->indexOf(&(helper.placeHolder()));
+                        auto dragWidgetHovered = getChildDragWidgetAt(container, pos);
                         if (canInsert && (isOnTop || isOnBottom || !canMerge)) {
                             if (isOnBottom) {
                                 dropIndex += 1;
                             helper.setHightlightedDragWidget(nullptr);
                         }
-                        else if (canMerge) {
+                        else if (canMerge && dragWidgetHovered) {
                             // drop on the middle -> merge
                             if (hasPlaceHolder()) {
                                 helper.removePlaceHolder();
                             helper.setHightlightedDragWidget(dragWidgetHovered);
                         }
                         else {
-                            qCWarning(LOG_VisualizationDragDropContainer())
+                            qCWarning(LOG_VisualizationDragDropContainer()) << tr(
-                                << tr("VisualizationDragDropContainer::findPlaceHolderPosition, no valid drop "
+                                                                                   "VisualizationDragDropContainer::findPlaceHolderPosition, no valid drop "
-                                      "action.");
+                                                                                   "action.");
                             Q_ASSERT(false);
                         }
                     }
                     else {
-                        qCWarning(LOG_VisualizationDragDropContainer()) << tr(
+                        qCWarning(LOG_VisualizationDragDropContainer())
-                            "VisualizationDragDropContainer::findPlaceHolderPosition, no widget found in the "
+                                << tr("VisualizationDragDropContainer::findPlaceHolderPosition, no widget "
-                            "container");
+                                      "found in the "
+                                      "container");
                     }
                 }
-                else if (!hasPlaceHolder() && canInsert) {
-                    // Drop on an empty container, just add the placeHolder at the top
-                    helper.insertPlaceHolder(m_Layout, 0);
                 else {
-                    // No hovered drag widget, the mouse is probably hover the placeHolder
+                    // the mouse is hover the placeHolder
                     // Do nothing
                 }
             }

gui/ui/Visualization/VisualizationTabWidget.ui +6 -2

                     <number>0</number>
                    </property>
                    <item>
-                    <widget class="VisualizationDragDropContainer" name="dragDropContainer" native="true"/>
+                    <widget class="VisualizationDragDropContainer" name="dragDropContainer">
+                     <property name="lineWidth">
+                      <number>0</number>
+                     </property>
+                    </widget>
                    </item>
                   </layout>
                  </widget>
              <customwidgets>
               <customwidget>
                <class>VisualizationDragDropContainer</class>
-               <extends>QWidget</extends>
+               <extends>QFrame</extends>
                <header>Visualization/VisualizationDragDropContainer.h</header>
                <container>1</container>
               </customwidget>

gui/ui/Visualization/VisualizationZoneWidget.ui +2 -5

                 </widget>
                </item>
                <item>
-                <widget class="QFrame" name="visualizationZoneFrame">
+                <widget class="VisualizationDragDropContainer" name="dragDropContainer">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                    <horstretch>0</horstretch>
                   <property name="bottomMargin">
                    <number>0</number>
                   </property>
-                  <item>
-                   <widget class="VisualizationDragDropContainer" name="dragDropContainer" native="true"/>
-                  </item>
                  </layout>
                 </widget>
                </item>
              <customwidgets>
               <customwidget>
                <class>VisualizationDragDropContainer</class>
-               <extends>QWidget</extends>
+               <extends>QFrame</extends>
                <header>Visualization/VisualizationDragDropContainer.h</header>
                <container>1</container>
               </customwidget>

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