summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2010-11-15 16:23:27 +0000
committerArtur Signell <artur.signell@itmill.com>2010-11-15 16:23:27 +0000
commitabe83056b23a79ad72ec9dbfc36429a3bef81fd9 (patch)
tree2639e82f5a143f7bd097ba3f17ace42da0bd3156 /src
parentd5aa1654711db4a5c4dea86435e046c0e4b40415 (diff)
downloadvaadin-framework-abe83056b23a79ad72ec9dbfc36429a3bef81fd9.tar.gz
vaadin-framework-abe83056b23a79ad72ec9dbfc36429a3bef81fd9.zip
Additional fix for #5906 - Menu shadow is too narrow in Chrome7. Previously the first click on a menu item after paint opened and immediately closed the menu
svn changeset:15990/svn branch:6.5
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
index 277159b53c..3c1016e4b6 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
@@ -77,6 +77,8 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable,
private boolean enabled = true;
+ private String width = "notinited";
+
public VMenuBar() {
// Create an empty horizontal menubar
this(false, null);
@@ -130,6 +132,11 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable,
@Override
public void setWidth(String width) {
+ if (Util.equals(this.width, width)) {
+ return;
+ }
+
+ this.width = width;
Util.setWidthExcludingPaddingAndBorder(this, width, 0);
if (!subMenu) {
// Only needed for root level menu
@@ -888,7 +895,7 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable,
private VMenuBar findRootMenu() {
VMenuBar menubar = getParentMenu();
-
+
// Traverse up until root menu is found
while (menubar.getParentMenu() != null) {
menubar = menubar.getParentMenu();