Browse Source

Cancel drag if on button (can't filter on same widget as ListView wouldn't work)

Josh Engebretson 8 years ago
parent
commit
386c3419e4
1 changed files with 6 additions and 0 deletions
  1. 6 0
      Source/Atomic/UI/UIDragDrop.cpp

+ 6 - 0
Source/Atomic/UI/UIDragDrop.cpp

@@ -101,6 +101,12 @@ void UIDragDrop::DragEnd()
         return;
         return;
     }
     }
 
 
+    // Filter dragging buttons on top of themselves
+    if ((dragSourceWidget == currentTargetWidget) && dragSourceWidget->IsInstanceOf<UIButton>())
+    {
+        return;
+    }
+
     VariantMap dropData;
     VariantMap dropData;
     dropData[DragEnded::P_TARGET] = currentTargetWidget;
     dropData[DragEnded::P_TARGET] = currentTargetWidget;
     dropData[DragEnded::P_DRAGOBJECT] = dragObject;
     dropData[DragEnded::P_DRAGOBJECT] = dragObject;