aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2007-09-19 11:01:31 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2007-09-19 11:01:31 +0000
commit07a4f5b3ce8a658ab3627ad4bb5380e18b8c12bc (patch)
tree0635643b7d8a67cfd9c5fad3573a723d8fb9f950 /src
parent9f727b20b9d2f89592f87e95274c35f0715dbb18 (diff)
downloadvaadin-framework-07a4f5b3ce8a658ab3627ad4bb5380e18b8c12bc.tar.gz
vaadin-framework-07a4f5b3ce8a658ab3627ad4bb5380e18b8c12bc.zip
context menu position now fixed with scroll position
svn changeset:2331/svn branch:trunk
Diffstat (limited to 'src')
-rw-r--r--src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java3
-rw-r--r--src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java3
2 files changed, 6 insertions, 0 deletions
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 33c15f5f8e..f13708fadb 100644
--- 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 2428ba34e9..dc859199c0 100644
--- 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);