angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-13 15:27:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

Menu: fixed arrow color if menu is selected

Browse Source
This commit is contained in:
Karl Tauber
2019-09-04 09:58:39 +02:00
parent 95b26940ba
commit 5f43740484
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatMenuArrowIcon.java
View File

@@ -20,6 +20,7 @@ import java.awt.Color;
import java.awt.Component; import java.awt.Component;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.geom.Path2D; import java.awt.geom.Path2D;
import javax.swing.JMenu;
import javax.swing.UIManager; import javax.swing.UIManager;
/** /**
@@ -27,6 +28,7 @@ import javax.swing.UIManager;
* *
* @uiDefault Menu.icon.arrowColor Color * @uiDefault Menu.icon.arrowColor Color
* @uiDefault Menu.icon.disabledArrowColor Color * @uiDefault Menu.icon.disabledArrowColor Color
* @uiDefault Menu.selectionForeground Color
* *
* @author Karl Tauber * @author Karl Tauber
*/ */
@@ -35,6 +37,7 @@ public class FlatMenuArrowIcon
{ {
protected final Color checkmarkColor = UIManager.getColor( "Menu.icon.arrowColor" ); protected final Color checkmarkColor = UIManager.getColor( "Menu.icon.arrowColor" );
protected final Color disabledCheckmarkColor = UIManager.getColor( "Menu.icon.disabledArrowColor" ); protected final Color disabledCheckmarkColor = UIManager.getColor( "Menu.icon.disabledArrowColor" );
protected final Color selectionForeground = UIManager.getColor( "Menu.selectionForeground" );
public FlatMenuArrowIcon() { public FlatMenuArrowIcon() {
super( 5, 10, null ); super( 5, 10, null );
@@ -51,7 +54,14 @@ public class FlatMenuArrowIcon
if( !c.getComponentOrientation().isLeftToRight() ) if( !c.getComponentOrientation().isLeftToRight() )
g.rotate( Math.toRadians( 180 ), width / 2., height / 2. ); g.rotate( Math.toRadians( 180 ), width / 2., height / 2. );
g.setColor( c.isEnabled() ? checkmarkColor : disabledCheckmarkColor ); g.setColor( getArrowColor( c ) );
g.fill( arrow ); g.fill( arrow );
} }
private Color getArrowColor( Component c ) {
if( c instanceof JMenu && ((JMenu)c).isSelected() )
return selectionForeground;
return c.isEnabled() ? checkmarkColor : disabledCheckmarkColor;
}
} }