Merge pull request #13035 from ronso0/dnd-hover-fix

(fix) Drag'n'drop: avoid unintended drag on hover (WTrackProperty, WCoverArt etc.)
mixxxdj · Apr 5, 2024 · 3546e22 · 3546e22
2 parents cbd280f + 14b774f
commit 3546e22
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/util/dnd.cpp b/src/util/dnd.cpp
@@ -102,6 +102,9 @@ bool allowLoadToPlayer(
 
 // Helper function for DragAndDropHelper::mousePressed and DragAndDropHelper::mouseMoveInitiatesDrag
 bool mouseMoveInitiatesDragHelper(QMouseEvent* pEvent, bool isPress) {
+    if (pEvent->buttons() != Qt::LeftButton) {
+        return false;
+    }
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     const qreal x = pEvent->position().x();
     const qreal y = pEvent->position().y();
@@ -209,9 +212,7 @@ bool DragAndDropHelper::allowDeckCloneAttempt(
 
 // static
 void DragAndDropHelper::mousePressed(QMouseEvent* pEvent) {
-    if (pEvent->button() == Qt::LeftButton) {
-        mouseMoveInitiatesDragHelper(pEvent, true);
-    }
+    mouseMoveInitiatesDragHelper(pEvent, true);
 }
 
 // static

diff --git a/src/widget/wcoverart.cpp b/src/widget/wcoverart.cpp
@@ -245,7 +245,7 @@ void WCoverArt::mousePressEvent(QMouseEvent* pEvent) {
 
     DragAndDropHelper::mousePressed(pEvent);
 
-    if (pEvent->button() == Qt::LeftButton) {
+    if (pEvent->buttons() == Qt::LeftButton) {
         pEvent->accept();
         // do nothing if left button is pressed,
         // wait for button release
@@ -259,7 +259,7 @@ void WCoverArt::mouseReleaseEvent(QMouseEvent* pEvent) {
         return;
     }
 
-    if (pEvent->button() == Qt::LeftButton && m_loadedTrack &&
+    if (pEvent->buttons() == Qt::LeftButton && m_loadedTrack &&
             m_clickTimer.isActive()) { // init/close fullsize cover
         if (m_pDlgFullSize->isVisible()) {
             m_pDlgFullSize->close();