hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "fix" for going outside menu group

Browse Source
This commit is contained in:
SiboVG 2024-08-09 18:07:24 +02:00
parent 5aff7ff066
commit cb86446b22
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
swing/src/main/java/info/openrocket/swing/gui/widgets/SearchableAndGroupableComboBox.java
View File

@ -213,7 +213,6 @@ public class SearchableAndGroupableComboBox<G extends Group, T extends Groupable
private JPopupMenu createGroupsPopup() { private JPopupMenu createGroupsPopup() {
final JPopupMenu menu = new JPopupMenu(); final JPopupMenu menu = new JPopupMenu();
MenuItemMouseListener menuItemListener = new MenuItemMouseListener();
// Add the search field at the top // Add the search field at the top
menu.add(searchFieldGroups); menu.add(searchFieldGroups);
@ -231,7 +230,6 @@ public class SearchableAndGroupableComboBox<G extends Group, T extends Groupable
} }
} }
}; };
groupMenu.addMouseListener(menuItemListener);
List<T> itemsForGroup = itemGroupMap.get(group); List<T> itemsForGroup = itemGroupMap.get(group);
if (itemsForGroup != null) { if (itemsForGroup != null) {
@ -267,30 +265,6 @@ public class SearchableAndGroupableComboBox<G extends Group, T extends Groupable
return menu; return menu;
} }
private class MenuItemMouseListener extends MouseAdapter {
private JMenu currentMenu;
@Override
public void mouseEntered(MouseEvent e) {
if (e.getSource() instanceof JMenu) {
currentMenu = (JMenu) e.getSource();
currentMenu.setPopupMenuVisible(true);
}
}
@Override
public void mouseExited(MouseEvent e) {
if (currentMenu != null && !isMouseOverMenu(currentMenu, e.getPoint())) {
currentMenu.setPopupMenuVisible(false);
currentMenu = null;
}
}
private boolean isMouseOverMenu(JMenu menu, Point point) {
return menu.getBounds().contains(SwingUtilities.convertPoint(menu.getParent(), point, menu));
}
}
private JPopupMenu createSearchPopup() { private JPopupMenu createSearchPopup() {
final JPopupMenu menu = new JPopupMenu(); final JPopupMenu menu = new JPopupMenu();
menu.setLayout(new BorderLayout()); menu.setLayout(new BorderLayout());