test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-05 04:38:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refs #1694 [Desktop] menu can look a bit strange if you hide some screens via security

Browse Source
This commit is contained in:
Yuriy Artamonov 2012-12-18 10:17:13 +00:00
parent 09a49ead06
commit eb094e8174
1 changed files with 64 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
modules/desktop/src/com/haulmont/cuba/desktop/sys/MenuBuilder.java
View File

@ -21,6 +21,8 @@ import javax.swing.event.MenuEvent;
import javax.swing.event.MenuListener;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@ -106,32 +108,83 @@ public class MenuBuilder {
}
});
MenuItem prevItem = null;
List<MenuItemContainer> items = new ArrayList<>();
// prepare menu items
for (MenuItem child : itemChildren) {
if (child.getChildren().isEmpty()) {
if (child.isSeparator()) {
// skip first and last separator
if (child != itemChildren.get(0) &&
child != itemChildren.get(itemChildren.size() - 1)) {
// skip separator after separator
if (prevItem == null || !prevItem.isSeparator())
jMenu.addSeparator();
}
items.add(new MenuItemContainer());
} else {
JMenuItem jMenuItem = new JMenuItem(MenuConfig.getMenuItemCaption(child.getId()));
assignCommand(jMenuItem, child);
assignShortcut(jMenuItem, child);
jMenu.add(jMenuItem);
items.add(new MenuItemContainer(jMenuItem));
}
} else {
JMenu jChildMenu = new JMenu(MenuConfig.getMenuItemCaption(child.getId()));
assignShortcut(jChildMenu, child);
createSubMenu(jChildMenu, child);
if (!isMenuEmpty(jChildMenu)) {
jMenu.add(jChildMenu);
items.add(new MenuItemContainer(jChildMenu));
}
}
prevItem = child;
}
// remove unnecessary separators
if (!items.isEmpty()) {
Iterator<MenuItemContainer> iterator = items.iterator();
JMenuItem menuItem = getNextMenuItem(iterator);
boolean useSeparator = false;
while (menuItem != null) {
if (useSeparator)
jMenu.addSeparator();
jMenu.add(menuItem);
useSeparator = false;
menuItem = null;
if (iterator.hasNext()) {
MenuItemContainer itemContainer = iterator.next();
if (!itemContainer.isSeparator())
menuItem = itemContainer.getMenuItem();
else {
menuItem = getNextMenuItem(iterator);
useSeparator = true;
}
}
}
}
}
private JMenuItem getNextMenuItem(Iterator<MenuItemContainer> iterator) {
JMenuItem item = null;
while (iterator.hasNext() && item == null) {
MenuItemContainer cMenuItem = iterator.next();
if (!cMenuItem.isSeparator())
item = cMenuItem.getMenuItem();
}
return item;
}
private static class MenuItemContainer {
private JMenuItem menuItem = null;
private MenuItemContainer() {
}
public MenuItemContainer(JMenuItem menuItem) {
this.menuItem = menuItem;
}
public JMenuItem getMenuItem() {
return menuItem;
}
public boolean isSeparator() {
return this.menuItem == null;
}
}