Check for dragging inside the ToggleAction and some housekeeping

ManiVaultStudio · Nov 20, 2024 · 25079ec · 25079ec
1 parent 6fac62a
commit 25079ec
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/ManiVault/src/actions/ToggleAction.cpp b/ManiVault/src/actions/ToggleAction.cpp
@@ -171,10 +171,14 @@ bool ToggleAction::CheckBoxWidget::eventFilter(QObject* target, QEvent* event)
     {
         case QEvent::MouseButtonPress:
         {
-            auto mouseEvent = static_cast<QMouseEvent*>(event);
+            auto mouseEvent = dynamic_cast<QMouseEvent*>(event);
 
-            if (_toggleAction->isEnabled() && mouseEvent->button() == Qt::LeftButton)
+            if (_toggleAction->isEnabled() && mouseEvent->button() == Qt::LeftButton && !_toggleAction->getDrag().isDragging())
+            {
+                qDebug() << "Toggle!";
                 _toggleAction->setChecked(!_toggleAction->isChecked());
+            }
+
 
             return true;
         }

diff --git a/ManiVault/src/actions/WidgetActionDrag.cpp b/ManiVault/src/actions/WidgetActionDrag.cpp
@@ -34,7 +34,7 @@ void WidgetActionDrag::start()
     if (!_dragAction)
         return;
 
-    _isDragging = true;
+    setIsDragging(true);
     {
         auto drag       = new QDrag(this);
         auto mimeData   = new WidgetActionMimeData(_dragAction);
@@ -44,7 +44,7 @@ void WidgetActionDrag::start()
 
         drag->exec();
     }
-    _isDragging = false;
+    QTimer::singleShot(100, [this]() { setIsDragging(false); });
 }
 
 void WidgetActionDrag::setIsDragging(bool dragging)

diff --git a/ManiVault/src/actions/WidgetActionLabel.cpp b/ManiVault/src/actions/WidgetActionLabel.cpp
@@ -19,10 +19,8 @@ namespace mv::gui {
 WidgetActionLabel::WidgetActionLabel(WidgetAction* action, QWidget* parent /*= nullptr*/, const std::uint32_t& flags /*= ColonAfterName*/) :
     WidgetActionViewWidget(parent, action),
     _flags(flags),
-    _nameLabel(),
     _elide(false),
-    _drag(nullptr),
-    _lastMousePressPosition()
+    _drag(nullptr)
 {
     setAction(action);
     setAcceptDrops(true);
@@ -63,7 +61,7 @@ bool WidgetActionLabel::eventFilter(QObject* target, QEvent* event)
             if (dynamic_cast<QWidget*>(target) != &_nameLabel)
                 break;
 
-            auto mouseEvent = static_cast<QMouseEvent*>(event);
+            auto mouseEvent = dynamic_cast<QMouseEvent*>(event);
 
             switch (mouseEvent->button())
             {
@@ -75,7 +73,7 @@ bool WidgetActionLabel::eventFilter(QObject* target, QEvent* event)
                     if (!getAction()->mayConnect(WidgetAction::Gui))
                         break;
 
-                    getAction()->getDrag().start();
+					getAction()->getDrag().start();
 
                     break;
                 }
@@ -99,7 +97,7 @@ bool WidgetActionLabel::eventFilter(QObject* target, QEvent* event)
                     if (contextMenu->actions().isEmpty())
                         return QWidget::eventFilter(target, event);
 
-                    contextMenu->exec(cursor().pos());
+                    contextMenu->exec(QCursor::pos());
 
                     break;
                 }

diff --git a/ManiVault/src/actions/WidgetActionMimeData.cpp b/ManiVault/src/actions/WidgetActionMimeData.cpp
@@ -7,9 +7,7 @@
 namespace mv::gui {
 
 WidgetActionMimeData::WidgetActionMimeData(WidgetAction* action) :
-    QMimeData(),
-    _action(action),
-    _highlightActions()
+    _action(action)
 {
     ActionsListModel    actionsListModel;      /** Actions list model */
     ActionsFilterModel  actionsFilterModel;    /** Filtered actions model */