context menu position now fixed with scroll position

svn changeset:2331/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
index 33c15f5f8ec345eb279913c36b934fef7f3f36d8..f13708fadb286f574a330cb9a0638687099664fc 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
@@ -12,6 +12,7 @@ import com.google.gwt.user.client.DeferredCommand;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.Timer;
+import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.Panel;
@@ -1720,6 +1721,8 @@ public class IScrollTable extends Composite implements Paintable, ITable, Scroll
                                if(actionKeys != null) {
                                        int left = DOM.eventGetClientX(event);
                                        int top = DOM.eventGetClientY(event);
+                                       top += Window.getScrollTop();
+                                       left += Window.getScrollLeft();
                                        client.getContextMenu().showAt(this, left, top);
                                }
                        }

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java
index 2428ba34e9a7a8ac54fb7db3b15b4cc0a622e813..dc859199c0b2c7651cb8d3724a857c565f92f408 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java
@@ -8,6 +8,7 @@ import java.util.Set;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
+import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Tree;
 import com.google.gwt.user.client.ui.TreeItem;
 import com.google.gwt.user.client.ui.TreeListener;
@@ -259,6 +260,8 @@ public class ITree extends Tree implements Paintable {
                        if(actionKeys != null) {
                                int left = DOM.eventGetClientX(event);
                                int top = DOM.eventGetClientY(event);
+                               top += Window.getScrollTop();
+                               left += Window.getScrollLeft();
                                client.getContextMenu().showAt(this, left, top);
                        }
                        DOM.eventCancelBubble(event, true);