diff options
author | Henri Sara <henri.sara@itmill.com> | 2011-06-14 07:55:53 +0000 |
---|---|---|
committer | Henri Sara <henri.sara@itmill.com> | 2011-06-14 07:55:53 +0000 |
commit | c90b09e075f3dbbe38db0e6008b8adb07e789575 (patch) | |
tree | d2386eaa3f7e2dcd50d4b9d1d97f08e8227d3a0a /src | |
parent | 8727670c7a90267ad4d2bceb69d18aee5c6f4615 (diff) | |
download | vaadin-framework-c90b09e075f3dbbe38db0e6008b8adb07e789575.tar.gz vaadin-framework-c90b09e075f3dbbe38db0e6008b8adb07e789575.zip |
#4125 fix for some cases with selectable items not on the deepest nested level, related test
svn changeset:19359/svn branch:6.6
Diffstat (limited to 'src')
-rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java index cab37e7c70..4d43b7c346 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java @@ -288,7 +288,7 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, currentItem.setSubMenu(currentMenu); } - if (!itr.hasNext()) { + while (!itr.hasNext() && !iteratorStack.empty()) { boolean hasCheckableItem = false; for (CustomMenuItem menuItem : currentMenu.getItems()) { hasCheckableItem = hasCheckableItem @@ -299,9 +299,7 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, } else { currentMenu.removeStyleDependentName("check-column"); } - } - while (!itr.hasNext() && !iteratorStack.empty()) { itr = iteratorStack.pop(); currentMenu = menuStack.pop(); } |