Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-06 14:00:55 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Menus: use disabled and pressed icons (issue #3)

Browse Source
This commit is contained in:
Karl Tauber
2020-04-26 11:24:49 +02:00
parent 115a2df2b0
commit 41dd0acfa3
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemRenderer.java
View File

@@ -214,7 +214,7 @@ debug*/
paintBackground( g, selectionBackground ); paintBackground( g, selectionBackground );
if( !isTopLevelMenu ) if( !isTopLevelMenu )
paintIcon( g, iconRect, getIcon() ); paintIcon( g, iconRect, getIconForPainting() );
paintText( g, textRect, menuItem.getText(), selectionForeground, disabledForeground ); paintText( g, textRect, menuItem.getText(), selectionForeground, disabledForeground );
paintAccelerator( g, accelRect, getAcceleratorText(), acceleratorForeground, acceleratorSelectionForeground, disabledForeground ); paintAccelerator( g, accelRect, getAcceleratorText(), acceleratorForeground, acceleratorSelectionForeground, disabledForeground );
if( !isTopLevelMenu ) if( !isTopLevelMenu )
@@ -304,6 +304,26 @@ debug*/
return (checkIcon != null) ? checkIcon : menuItem.getIcon(); return (checkIcon != null) ? checkIcon : menuItem.getIcon();
} }
private Icon getIconForPainting() {
if( checkIcon != null )
return checkIcon;
Icon icon = menuItem.getIcon();
if( icon == null )
return null;
if( !menuItem.isEnabled() )
return menuItem.getDisabledIcon();
if( menuItem.getModel().isPressed() && menuItem.isArmed() ) {
Icon pressedIcon = menuItem.getPressedIcon();
if( pressedIcon != null )
return pressedIcon;
}
return icon;
}
private Dimension getIconSize() { private Dimension getIconSize() {
Icon icon = getIcon(); Icon icon = getIcon();
int iconWidth = (icon != null) ? icon.getIconWidth() : 0; int iconWidth = (icon != null) ? icon.getIconWidth() : 0;