diff options
| author | John Alhroos <john.ahlroos@itmill.com> | 2011-05-18 08:47:40 +0000 |
|---|---|---|
| committer | John Alhroos <john.ahlroos@itmill.com> | 2011-05-18 08:47:40 +0000 |
| commit | a87072367ade16fc480177aee36ca31743f18fb9 (patch) | |
| tree | cdc6045d01f0a603e0b09fae46bd5b04254c1219 /src | |
| parent | ab00ecc239d410c9fa80bbcd646fe3d864ed8fe8 (diff) | |
| download | vaadin-framework-a87072367ade16fc480177aee36ca31743f18fb9.tar.gz vaadin-framework-a87072367ade16fc480177aee36ca31743f18fb9.zip | |
Fixes issue with menubar submenu overflowing right edge of the screen in IE/and causing scrollbars #5547
svn changeset:18878/svn branch:6.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java index c609eb846b..650a51c992 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java @@ -8,10 +8,8 @@ import java.util.Iterator; import java.util.List; import java.util.Stack; -import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; -import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.dom.client.NodeList; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.dom.client.FocusEvent; @@ -39,7 +37,6 @@ import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.client.TooltipInfo; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.Util; -import com.vaadin.terminal.gwt.client.VConsole; import com.vaadin.terminal.gwt.client.VTooltip; public class VMenuBar extends SimpleFocusablePanel implements Paintable, @@ -663,7 +660,8 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, popup.addCloseHandler(this); popup.addAutoHidePartner(item.getElement()); - popup.setPopupPosition(left, top); + // at 0,0 because otherwise IE7 add extra scrollbars (#5547) + popup.setPopupPosition(0, 0); item.getSubMenu().onShow(); visibleChildMenu = item.getSubMenu(); @@ -684,8 +682,8 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, if (left < shadowSpace) { left = shadowSpace; } - popup.setPopupPosition(left, top); } + popup.setPopupPosition(left, top); // IE7 really tests one's patience sometimes // Part of a fix to correct #3850 |