From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Tue, 9 Mar 2010 10:19:11 +0000 (+0000)
Subject: Context menus now work properly in Tree and Table if dragging is enabled
X-Git-Tag: 6.7.0.beta1~1976
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8d9850db3f9554b965f8d0a2ba4aa518f847b73c;p=vaadin-framework.git

Context menus now work properly in Tree and Table if dragging is enabled

svn changeset:11704/svn branch:6.3
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index 0cbb3d73e3..e69da3be9b 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -13,6 +13,7 @@ import java.util.List;
 import java.util.Set;
 
 import com.google.gwt.dom.client.Document;
+import com.google.gwt.dom.client.NativeEvent;
 import com.google.gwt.dom.client.NodeList;
 import com.google.gwt.dom.client.TableCellElement;
 import com.google.gwt.dom.client.TableRowElement;
@@ -2514,7 +2515,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
                             showContextMenu(event);
                             break;
                         case Event.ONMOUSEDOWN:
-                            if (dragmode != 0) {
+                            if (dragmode != 0
+                                    && event.getButton() == NativeEvent.BUTTON_LEFT) {
                                 mDown = true;
                                 VTransferable transferable = new VTransferable();
                                 transferable.setDragSource(VScrollTable.this);
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTree.java b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
index 5b2cc0c035..f65782f05b 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTree.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
@@ -442,7 +442,8 @@ public class VTree extends FlowPanel implements Paintable, VHasDropHandler {
             if (dragMode != 0 || dropHandler != null) {
                 if (type == Event.ONMOUSEDOWN) {
                     if (nodeCaptionDiv.isOrHasChild(event.getTarget())) {
-                        if (dragMode > 0) {
+                        if (dragMode > 0
+                                && event.getButton() == NativeEvent.BUTTON_LEFT) {
 
                             ApplicationConnection.getConsole().log(
                                     "TreeNode m down");