mirror of
https://github.com/JFormDesigner/FlatLaf.git
synced 2026-02-12 06:57:13 -06:00
Merge PR #415: MenuItem: paint the selected icon when the item is selected
This commit is contained in:
@@ -444,6 +444,10 @@ debug*/
|
||||
htmlView.paint( HiDPIUtils.createGraphicsTextYCorrection( (Graphics2D) g ), textRect );
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns {@code true} if either the menu item is armed (mouse over item)
|
||||
* or it is a {@code JMenu} and selected (shows submenu).
|
||||
*/
|
||||
protected static boolean isArmedOrSelected( JMenuItem menuItem ) {
|
||||
return menuItem.isArmed() || (menuItem instanceof JMenu && menuItem.isSelected());
|
||||
}
|
||||
@@ -474,6 +478,12 @@ debug*/
|
||||
return pressedIcon;
|
||||
}
|
||||
|
||||
if( isArmedOrSelected( menuItem ) ) {
|
||||
Icon selectedIcon = menuItem.getSelectedIcon();
|
||||
if( selectedIcon != null )
|
||||
return selectedIcon;
|
||||
}
|
||||
|
||||
return icon;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user