commit 1f6ac6c6d5974c6d767f2b69964b3b38793c285d
author Dirk Fauth <dirk.fauth@googlemail.com> Tue Sep 29 06:24:31 2015 -0400
committer Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> Tue Sep 29 06:24:31 2015 -0400
tree 2da257ced31b9516a66bee6244135da916af820f
parent c3eb681fbc996dde7a6ecd02675eb793d1ff18dc
parent e0e5c8385d04dafd87f967fc40f7b18ebb849e9b

Merge "Bug 478186 - RenameColumnHeaderEvent can contain both positions or columns"

org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/ui/action/DragModeEventHandler.java

diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/ui/action/DragModeEventHandler.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/ui/action/DragModeEventHandler.java
index 5d60cf4..da279f8 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/ui/action/DragModeEventHandler.java
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/ui/action/DragModeEventHandler.java
@@ -27,6 +27,8 @@
     private final MouseModeEventHandler parentModeEventHandler;
     private final MouseEvent mouseDownEvent;
 
+    private boolean realDrag = false;
+
     public DragModeEventHandler(
             ModeSupport modeSupport,
             NatTable natTable,
@@ -44,6 +46,11 @@
     @Override
     public void mouseMove(MouseEvent event) {
         this.dragMode.mouseMove(this.natTable, event);
+
+        if (!this.realDrag
+                && !MouseEventHelper.treatAsClick(this.mouseDownEvent, event)) {
+            this.realDrag = true;
+        }
     }
 
     @Override
@@ -54,7 +61,8 @@
         // Bug 379884
         // check if the drag operation started and ended within the same cell
         // in that case the registered click operation is executed also
-        if (MouseEventHelper.eventOnSameCell(this.natTable, this.mouseDownEvent, event)) {
+        if (!this.realDrag
+                && MouseEventHelper.eventOnSameCell(this.natTable, this.mouseDownEvent, event)) {
             this.parentModeEventHandler.mouseUp(event);
         }
     }