Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Separate check/radio icon from menu item icon #874

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Separate check/radio icon from menu item icon #874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 64 additions & 6 deletions flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,14 @@
import java.text.AttributedCharacterIterator;
import java.util.Map;
import javax.swing.Icon;
import javax.swing.JCheckBoxMenuItem;
import javax.swing.JComponent;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JRadioButtonMenuItem;
import javax.swing.KeyStroke;
import javax.swing.MenuElement;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.plaf.basic.BasicHTML;
Expand Down Expand Up @@ -73,6 +76,7 @@
* @uiDefault MenuItem.underlineSelectionCheckBackground Color
* @uiDefault MenuItem.underlineSelectionColor Color
* @uiDefault MenuItem.underlineSelectionHeight int
* @uiDefault MenuItem.separateIconFromCheck boolean
*
* @author Karl Tauber
*/
Expand Down Expand Up @@ -103,6 +107,7 @@ public class FlatMenuItemRenderer
@Styleable protected Color underlineSelectionCheckBackground = UIManager.getColor( "MenuItem.underlineSelectionCheckBackground" );
@Styleable protected Color underlineSelectionColor = UIManager.getColor( "MenuItem.underlineSelectionColor" );
@Styleable protected int underlineSelectionHeight = UIManager.getInt( "MenuItem.underlineSelectionHeight" );
@Styleable protected boolean separateIconFromCheck = UIManager.getBoolean( "MenuItem.separateIconFromCheck" );

private boolean iconsShared = true;
private final Font menuFont = UIManager.getFont( "Menu.font" );
Expand Down Expand Up @@ -195,6 +200,7 @@ protected Dimension getPreferredMenuItemSize() {
int width = 0;
int height = 0;
boolean isTopLevelMenu = isTopLevelMenu( menuItem );
boolean isIconSeparated = isIconSeparated( menuItem );

Rectangle viewRect = new Rectangle( 0, 0, Integer.MAX_VALUE, Integer.MAX_VALUE );
Rectangle iconRect = new Rectangle();
Expand Down Expand Up @@ -237,6 +243,11 @@ protected Dimension getPreferredMenuItemSize() {
height = Math.max( arrowIcon.getIconHeight(), height );
}

if( isIconSeparated ) {
// gap between check and icon
width += iconRect.width + scale( menuItem.getIconTextGap() );
}

// add insets
Insets insets = menuItem.getInsets();
width += insets.left + insets.right;
Expand All @@ -251,10 +262,11 @@ protected Dimension getPreferredMenuItemSize() {
return new Dimension( width, height );
}

private void layout( Rectangle viewRect, Rectangle iconRect, Rectangle textRect,
Rectangle accelRect, Rectangle arrowRect, Rectangle labelRect )
private void layout( Rectangle viewRect, Rectangle checkRect, Rectangle iconRect,
Rectangle textRect, Rectangle accelRect, Rectangle arrowRect, Rectangle labelRect )
{
boolean isTopLevelMenu = isTopLevelMenu( menuItem );
boolean isIconSeparated = isIconSeparated( menuItem );

// layout arrow
boolean showArrowIcon = (arrowIcon != null && (!isTopLevelMenu || isInVerticalMenuBar( menuItem )));
Expand Down Expand Up @@ -311,6 +323,16 @@ private void layout( Rectangle viewRect, Rectangle iconRect, Rectangle textRect,
menuItem.getVerticalAlignment(), menuItem.getHorizontalAlignment(),
menuItem.getVerticalTextPosition(), menuItem.getHorizontalTextPosition(),
labelRect, iconRect, textRect, scale( menuItem.getIconTextGap() ) );

checkRect.setBounds( iconRect );

if( isIconSeparated ) {
int width = checkRect.width + scale( menuItem.getIconTextGap() );
iconRect.x += width;
textRect.x += width;
labelRect.x += width;
textRect.width -= width;
}
}

private static int centerOffset( int wh1, int wh2 ) {
Expand All @@ -329,15 +351,17 @@ protected void paintMenuItem( Graphics g, Color selectionBackground, Color selec
viewRect.width -= (insets.left + insets.right);
viewRect.height -= (insets.top + insets.bottom);

Rectangle checkRect = new Rectangle();
Rectangle iconRect = new Rectangle();
Rectangle textRect = new Rectangle();
Rectangle accelRect = new Rectangle();
Rectangle arrowRect = new Rectangle();
Rectangle labelRect = new Rectangle();

layout( viewRect, iconRect, textRect, accelRect, arrowRect, labelRect );
layout( viewRect, checkRect, iconRect, textRect, accelRect, arrowRect, labelRect );

/*debug
g.setColor( Color.pink ); g.drawRect( checkRect.x, checkRect.y, checkRect.width - 1, checkRect.height - 1 );
g.setColor( Color.green ); g.drawRect( viewRect.x, viewRect.y, viewRect.width - 1, viewRect.height - 1 );
g.setColor( Color.red ); g.drawRect( labelRect.x, labelRect.y, labelRect.width - 1, labelRect.height - 1 );
g.setColor( Color.blue ); g.drawRect( iconRect.x, iconRect.y, iconRect.width - 1, iconRect.height - 1 );
Expand All @@ -356,7 +380,19 @@ protected void paintMenuItem( Graphics g, Color selectionBackground, Color selec
else
paintSelection( g, selectionBackground, selectionInsets, selectionArc );
}
paintIcon( g, iconRect, getIconForPainting(), underlineSelection ? underlineSelectionCheckBackground : checkBackground, selectionBackground );

if( isIconSeparated( menuItem ) ) {
if( menuItem instanceof JCheckBoxMenuItem ) {
paintIcon( g, checkRect, UIManager.getIcon( "CheckBox.icon" ) );
} else if( menuItem instanceof JRadioButtonMenuItem ) {
paintIcon( g, checkRect, UIManager.getIcon( "RadioButton.icon" ) );
}

paintIcon( g, iconRect, getIconForPainting(false) );
} else {
paintIcon( g, iconRect, getIconForPainting(true), underlineSelection ? underlineSelectionCheckBackground : checkBackground, selectionBackground );
}

paintText( g, textRect, menuItem.getText(), selectionForeground, disabledForeground );
paintAccelerator( g, accelRect, getAcceleratorText(), acceleratorForeground, acceleratorSelectionForeground, disabledForeground );
if( arrowIcon != null && (!isTopLevelMenu( menuItem ) || isInVerticalMenuBar( menuItem )) )
Expand Down Expand Up @@ -429,6 +465,10 @@ protected void paintIcon( Graphics g, Rectangle iconRect, Icon icon, Color check
paintIcon( g, menuItem, icon, iconRect );
}

protected void paintIcon( Graphics g, Rectangle iconRect, Icon icon ) {
paintIcon( g, menuItem, icon, iconRect );
}

protected void paintText( Graphics g, Rectangle textRect, String text, Color selectionForeground, Color disabledForeground ) {
View htmlView = (View) menuItem.getClientProperty( BasicHTML.propertyKey );
if( htmlView != null ) {
Expand Down Expand Up @@ -537,6 +577,24 @@ protected boolean isUnderlineSelection() {
return "underline".equals( UIManager.getString( "MenuItem.selectionType" ) );
}

protected boolean isIconSeparated( JMenuItem item ) {
if( !separateIconFromCheck)
return false;

Container parent = item.getParent();
if( !(parent instanceof MenuElement) )
return false;

for( MenuElement element : ((MenuElement) parent).getSubElements() ) {
Component c = element.getComponent();
if( c instanceof JCheckBoxMenuItem && ((JCheckBoxMenuItem) c).getIcon() != null )
return true;
if( c instanceof JRadioButtonMenuItem && ((JRadioButtonMenuItem) c).getIcon() != null )
return true;
}
return false;
}

private Font getTopLevelFont() {
Font font = menuItem.getFont();
// menu item parent may be null if JMenu.isTopLevelMenu() is overridden
Expand All @@ -546,10 +604,10 @@ private Font getTopLevelFont() {
: menuItem.getParent().getFont();
}

private Icon getIconForPainting() {
private Icon getIconForPainting(boolean canUseCheckIcon) {
Icon icon = menuItem.getIcon();

if( icon == null && checkIcon != null && !isTopLevelMenu( menuItem ) )
if( icon == null && canUseCheckIcon && checkIcon != null && !isTopLevelMenu( menuItem ) )
return checkIcon;

if( icon == null )
Expand Down
1 change: 1 addition & 0 deletions flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,7 @@ MenuItem.acceleratorDelimiter = "+"
[mac]MenuItem.acceleratorDelimiter = ""
MenuItem.selectionInsets = 0,0,0,0
MenuItem.selectionArc = 0
MenuItem.separateIconFromCheck = false

# for MenuItem.selectionType = underline
MenuItem.underlineSelectionBackground = @menuHoverBackground
Expand Down
Loading