Skip to content

Commit 7890578

Browse files
ShadelessFoxShadelessFox
committed
Separate check/radio icon from menu item icon
1 parent 2870ee5 commit 7890578

File tree

5 files changed

+142
-6
lines changed

5 files changed

+142
-6
lines changed

‎flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemRenderer.java‎

Lines changed: 64 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,14 @@
3535
import java.text.AttributedCharacterIterator;
3636
import java.util.Map;
3737
import javax.swing.Icon;
38+
import javax.swing.JCheckBoxMenuItem;
3839
import javax.swing.JComponent;
3940
import javax.swing.JMenu;
4041
import javax.swing.JMenuBar;
4142
import javax.swing.JMenuItem;
43+
import javax.swing.JRadioButtonMenuItem;
4244
import javax.swing.KeyStroke;
45+
import javax.swing.MenuElement;
4346
import javax.swing.SwingUtilities;
4447
import javax.swing.UIManager;
4548
import javax.swing.plaf.basic.BasicHTML;
@@ -73,6 +76,7 @@
7376
* @uiDefault MenuItem.underlineSelectionCheckBackground Color
7477
* @uiDefault MenuItem.underlineSelectionColor Color
7578
* @uiDefault MenuItem.underlineSelectionHeight int
79+
* @uiDefault MenuItem.checkIconSeparated boolean
7680
*
7781
* @author Karl Tauber
7882
*/
@@ -103,6 +107,7 @@ public class FlatMenuItemRenderer
103107
@Styleable protected Color underlineSelectionCheckBackground = UIManager.getColor( "MenuItem.underlineSelectionCheckBackground" );
104108
@Styleable protected Color underlineSelectionColor = UIManager.getColor( "MenuItem.underlineSelectionColor" );
105109
@Styleable protected int underlineSelectionHeight = UIManager.getInt( "MenuItem.underlineSelectionHeight" );
110+
@Styleable protected boolean checkIconSeparated = UIManager.getBoolean( "MenuItem.checkIconSeparated" );
106111

107112
private boolean iconsShared = true;
108113
private final Font menuFont = UIManager.getFont( "Menu.font" );
@@ -195,6 +200,7 @@ protected Dimension getPreferredMenuItemSize() {
195200
int width = 0;
196201
int height = 0;
197202
boolean isTopLevelMenu = isTopLevelMenu( menuItem );
203+
boolean isIconSeparated = isIconSeparated( menuItem );
198204

199205
Rectangle viewRect = new Rectangle( 0, 0, Integer.MAX_VALUE, Integer.MAX_VALUE );
200206
Rectangle iconRect = new Rectangle();
@@ -237,6 +243,11 @@ protected Dimension getPreferredMenuItemSize() {
237243
height = Math.max( arrowIcon.getIconHeight(), height );
238244
}
239245

246+
if( isIconSeparated ) {
247+
// gap between check and icon
248+
width += iconRect.width + scale( menuItem.getIconTextGap() );
249+
}
250+
240251
// add insets
241252
Insets insets = menuItem.getInsets();
242253
width += insets.left + insets.right;
@@ -251,10 +262,11 @@ protected Dimension getPreferredMenuItemSize() {
251262
return new Dimension( width, height );
252263
}
253264

254-
private void layout( Rectangle viewRect, Rectangle iconRect, Rectangle textRect,
255-
Rectangle accelRect, Rectangle arrowRect, Rectangle labelRect )
265+
private void layout( Rectangle viewRect, Rectangle checkRect, Rectangle iconRect,
266+
Rectangle textRect, Rectangle accelRect, Rectangle arrowRect, Rectangle labelRect )
256267
{
257268
boolean isTopLevelMenu = isTopLevelMenu( menuItem );
269+
boolean isIconSeparated = isIconSeparated( menuItem );
258270

259271
// layout arrow
260272
boolean showArrowIcon = (arrowIcon != null && (!isTopLevelMenu || isInVerticalMenuBar( menuItem )));
@@ -311,6 +323,16 @@ private void layout( Rectangle viewRect, Rectangle iconRect, Rectangle textRect,
311323
menuItem.getVerticalAlignment(), menuItem.getHorizontalAlignment(),
312324
menuItem.getVerticalTextPosition(), menuItem.getHorizontalTextPosition(),
313325
labelRect, iconRect, textRect, scale( menuItem.getIconTextGap() ) );
326+
327+
checkRect.setBounds( iconRect );
328+
329+
if( isIconSeparated ) {
330+
int width = checkRect.width + scale( menuItem.getIconTextGap() );
331+
iconRect.x += width;
332+
textRect.x += width;
333+
labelRect.x += width;
334+
textRect.width -= width;
335+
}
314336
}
315337

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

354+
Rectangle checkRect = new Rectangle();
332355
Rectangle iconRect = new Rectangle();
333356
Rectangle textRect = new Rectangle();
334357
Rectangle accelRect = new Rectangle();
335358
Rectangle arrowRect = new Rectangle();
336359
Rectangle labelRect = new Rectangle();
337360

338-
layout( viewRect, iconRect, textRect, accelRect, arrowRect, labelRect );
361+
layout( viewRect, checkRect, iconRect, textRect, accelRect, arrowRect, labelRect );
339362

340363
/*debug
364+
g.setColor( Color.pink ); g.drawRect( checkRect.x, checkRect.y, checkRect.width - 1, checkRect.height - 1 );
341365
g.setColor( Color.green ); g.drawRect( viewRect.x, viewRect.y, viewRect.width - 1, viewRect.height - 1 );
342366
g.setColor( Color.red ); g.drawRect( labelRect.x, labelRect.y, labelRect.width - 1, labelRect.height - 1 );
343367
g.setColor( Color.blue ); g.drawRect( iconRect.x, iconRect.y, iconRect.width - 1, iconRect.height - 1 );
@@ -356,7 +380,19 @@ protected void paintMenuItem( Graphics g, Color selectionBackground, Color selec
356380
else
357381
paintSelection( g, selectionBackground, selectionInsets, selectionArc );
358382
}
359-
paintIcon( g, iconRect, getIconForPainting(), underlineSelection ? underlineSelectionCheckBackground : checkBackground, selectionBackground );
383+
384+
if( isIconSeparated( menuItem ) ) {
385+
if( menuItem instanceof JCheckBoxMenuItem ) {
386+
paintIcon( g, checkRect, UIManager.getIcon( "CheckBox.icon" ) );
387+
} else if( menuItem instanceof JRadioButtonMenuItem ) {
388+
paintIcon( g, checkRect, UIManager.getIcon( "RadioButton.icon" ) );
389+
}
390+
391+
paintIcon( g, iconRect, getIconForPainting(false) );
392+
} else {
393+
paintIcon( g, iconRect, getIconForPainting(true), underlineSelection ? underlineSelectionCheckBackground : checkBackground, selectionBackground );
394+
}
395+
360396
paintText( g, textRect, menuItem.getText(), selectionForeground, disabledForeground );
361397
paintAccelerator( g, accelRect, getAcceleratorText(), acceleratorForeground, acceleratorSelectionForeground, disabledForeground );
362398
if( arrowIcon != null && (!isTopLevelMenu( menuItem ) || isInVerticalMenuBar( menuItem )) )
@@ -429,6 +465,10 @@ protected void paintIcon( Graphics g, Rectangle iconRect, Icon icon, Color check
429465
paintIcon( g, menuItem, icon, iconRect );
430466
}
431467

468+
protected void paintIcon( Graphics g, Rectangle iconRect, Icon icon ) {
469+
paintIcon( g, menuItem, icon, iconRect );
470+
}
471+
432472
protected void paintText( Graphics g, Rectangle textRect, String text, Color selectionForeground, Color disabledForeground ) {
433473
View htmlView = (View) menuItem.getClientProperty( BasicHTML.propertyKey );
434474
if( htmlView != null ) {
@@ -537,6 +577,24 @@ protected boolean isUnderlineSelection() {
537577
return "underline".equals( UIManager.getString( "MenuItem.selectionType" ) );
538578
}
539579

580+
protected boolean isIconSeparated( JMenuItem item ) {
581+
if( !checkIconSeparated )
582+
return false;
583+
584+
Container parent = item.getParent();
585+
if( !(parent instanceof MenuElement) )
586+
return false;
587+
588+
for( MenuElement element : ((MenuElement) parent).getSubElements() ) {
589+
Component c = element.getComponent();
590+
if( c instanceof JCheckBoxMenuItem && ((JCheckBoxMenuItem) c).getIcon() != null )
591+
return true;
592+
if( c instanceof JRadioButtonMenuItem && ((JRadioButtonMenuItem) c).getIcon() != null )
593+
return true;
594+
}
595+
return false;
596+
}
597+
540598
private Font getTopLevelFont() {
541599
Font font = menuItem.getFont();
542600
// menu item parent may be null if JMenu.isTopLevelMenu() is overridden
@@ -546,10 +604,10 @@ private Font getTopLevelFont() {
546604
: menuItem.getParent().getFont();
547605
}
548606

549-
private Icon getIconForPainting() {
607+
private Icon getIconForPainting(boolean canUseCheckIcon) {
550608
Icon icon = menuItem.getIcon();
551609

552-
if( icon == null && checkIcon != null && !isTopLevelMenu( menuItem ) )
610+
if( icon == null && canUseCheckIcon && checkIcon != null && !isTopLevelMenu( menuItem ) )
553611
return checkIcon;
554612

555613
if( icon == null )

‎flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@ MenuItem.verticallyAlignText = true
447447
MenuItem.background = @menuBackground
448448
MenuItem.checkBackground = @menuCheckBackground
449449
MenuItem.checkMargins = 2,2,2,2
450+
MenuItem.checkIconSeparated = false
450451
MenuItem.minimumWidth = 72
451452
MenuItem.minimumIconSize = 16,16
452453
MenuItem.iconTextGap = 6

‎flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -501,8 +501,14 @@ private boolean supportsFlatLafWindowDecorations() {
501501
return FlatLaf.supportsNativeWindowDecorations() || SystemInfo.isLinux;
502502
}
503503

504+
private void showCheckMenuIconsSeparately() {
505+
UIManager.put( "MenuItem.checkIconSeparated", showMenuCheckIconsSeparately.isSelected() );
506+
FlatLaf.updateUI();
507+
}
508+
504509
private void initComponents() {
505510
// JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents
511+
// Generated using JFormDesigner Evaluation license - yiliso9162
506512
menuBar = new JMenuBar();
507513
JMenu fileMenu = new JMenu();
508514
JMenuItem newMenuItem = new JMenuItem();
@@ -530,6 +536,10 @@ private void initComponents() {
530536
scrollingPopupMenu = new JMenu();
531537
JMenuItem menuItem2 = new JMenuItem();
532538
htmlMenuItem = new JMenuItem();
539+
JCheckBoxMenuItem checkBoxMenuItem2 = new JCheckBoxMenuItem();
540+
JCheckBoxMenuItem checkBoxMenuItem3 = new JCheckBoxMenuItem();
541+
JRadioButtonMenuItem radioButtonMenuItem4 = new JRadioButtonMenuItem();
542+
JRadioButtonMenuItem radioButtonMenuItem5 = new JRadioButtonMenuItem();
533543
JRadioButtonMenuItem radioButtonMenuItem1 = new JRadioButtonMenuItem();
534544
JRadioButtonMenuItem radioButtonMenuItem2 = new JRadioButtonMenuItem();
535545
JRadioButtonMenuItem radioButtonMenuItem3 = new JRadioButtonMenuItem();
@@ -545,6 +555,7 @@ private void initComponents() {
545555
underlineMenuSelectionMenuItem = new JCheckBoxMenuItem();
546556
alwaysShowMnemonicsMenuItem = new JCheckBoxMenuItem();
547557
animatedLafChangeMenuItem = new JCheckBoxMenuItem();
558+
showMenuCheckIconsSeparately = new JCheckBoxMenuItem();
548559
JMenuItem showHintsMenuItem = new JMenuItem();
549560
JMenuItem showUIDefaultsInspectorMenuItem = new JMenuItem();
550561
JMenu helpMenu = new JMenu();
@@ -755,6 +766,28 @@ private void initComponents() {
755766
//---- htmlMenuItem ----
756767
htmlMenuItem.setText("<html>some <b color=\"red\">HTML</b> <i color=\"blue\">text</i></html>");
757768
viewMenu.add(htmlMenuItem);
769+
770+
//---- checkBoxMenuItem2 ----
771+
checkBoxMenuItem2.setText("Check Box");
772+
checkBoxMenuItem2.setSelected(true);
773+
viewMenu.add(checkBoxMenuItem2);
774+
775+
//---- checkBoxMenuItem3 ----
776+
checkBoxMenuItem3.setText("Check Box with Icon");
777+
checkBoxMenuItem3.setSelected(true);
778+
checkBoxMenuItem3.setIcon(new FlatSVGIcon("com/formdev/flatlaf/demo/icons/show.svg"));
779+
viewMenu.add(checkBoxMenuItem3);
780+
781+
//---- radioButtonMenuItem4 ----
782+
radioButtonMenuItem4.setText("Radio Button");
783+
radioButtonMenuItem4.setSelected(true);
784+
viewMenu.add(radioButtonMenuItem4);
785+
786+
//---- radioButtonMenuItem5 ----
787+
radioButtonMenuItem5.setText("Radio Button with Icon");
788+
radioButtonMenuItem5.setSelected(true);
789+
radioButtonMenuItem5.setIcon(new FlatSVGIcon("com/formdev/flatlaf/demo/icons/show.svg"));
790+
viewMenu.add(radioButtonMenuItem5);
758791
viewMenu.addSeparator();
759792

760793
//---- radioButtonMenuItem1 ----
@@ -842,6 +875,11 @@ private void initComponents() {
842875
animatedLafChangeMenuItem.addActionListener(e -> animatedLafChangeChanged());
843876
optionsMenu.add(animatedLafChangeMenuItem);
844877

878+
//---- showMenuCheckIconsSeparately ----
879+
showMenuCheckIconsSeparately.setText("Show check menu icons separately");
880+
showMenuCheckIconsSeparately.addActionListener(e -> showCheckMenuIconsSeparately());
881+
optionsMenu.add(showMenuCheckIconsSeparately);
882+
845883
//---- showHintsMenuItem ----
846884
showHintsMenuItem.setText("Show hints");
847885
showHintsMenuItem.addActionListener(e -> showHintsChanged());
@@ -871,6 +909,12 @@ private void initComponents() {
871909

872910
//======== toolBarPanel ========
873911
{
912+
toolBarPanel.setBorder (new javax. swing. border. CompoundBorder( new javax .swing .border .TitledBorder (new javax. swing. border
913+
. EmptyBorder( 0, 0, 0, 0) , "JFor\u006dDesi\u0067ner \u0045valu\u0061tion", javax. swing. border. TitledBorder. CENTER, javax
914+
. swing. border. TitledBorder. BOTTOM, new java .awt .Font ("Dia\u006cog" ,java .awt .Font .BOLD ,
915+
12 ), java. awt. Color. red) ,toolBarPanel. getBorder( )) ); toolBarPanel. addPropertyChangeListener (new java. beans
916+
. PropertyChangeListener( ){ @Override public void propertyChange (java .beans .PropertyChangeEvent e) {if ("bord\u0065r" .equals (e .
917+
getPropertyName () )) throw new RuntimeException( ); }} );
874918
toolBarPanel.setLayout(new BorderLayout());
875919

876920
//======== macFullWindowContentButtonsPlaceholder ========
@@ -1041,6 +1085,7 @@ private void unsupported( JCheckBoxMenuItem menuItem ) {
10411085
}
10421086

10431087
// JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables
1088+
// Generated using JFormDesigner Evaluation license - yiliso9162
10441089
private JMenuBar menuBar;
10451090
private JMenuItem exitMenuItem;
10461091
private JMenu scrollingPopupMenu;
@@ -1054,6 +1099,7 @@ private void unsupported( JCheckBoxMenuItem menuItem ) {
10541099
private JCheckBoxMenuItem underlineMenuSelectionMenuItem;
10551100
private JCheckBoxMenuItem alwaysShowMnemonicsMenuItem;
10561101
private JCheckBoxMenuItem animatedLafChangeMenuItem;
1102+
private JCheckBoxMenuItem showMenuCheckIconsSeparately;
10571103
private JMenuItem aboutMenuItem;
10581104
private JToolBar toolBar;
10591105
private JTabbedPane tabbedPane;

‎flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.jfd‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,28 @@ new FormModel {
336336
"JavaCodeGenerator.variableLocal": false
337337
}
338338
} )
339+
add( new FormComponent( "javax.swing.JCheckBoxMenuItem" ) {
340+
name: "checkBoxMenuItem2"
341+
"text": "Check Box"
342+
"selected": true
343+
} )
344+
add( new FormComponent( "javax.swing.JCheckBoxMenuItem" ) {
345+
name: "checkBoxMenuItem3"
346+
"text": "Check Box with Icon"
347+
"selected": true
348+
"icon": new com.jformdesigner.model.SwingIcon( 0, "/com/formdev/flatlaf/demo/icons/show.svg" )
349+
} )
350+
add( new FormComponent( "javax.swing.JRadioButtonMenuItem" ) {
351+
name: "radioButtonMenuItem4"
352+
"text": "Radio Button"
353+
"selected": true
354+
} )
355+
add( new FormComponent( "javax.swing.JRadioButtonMenuItem" ) {
356+
name: "radioButtonMenuItem5"
357+
"text": "Radio Button with Icon"
358+
"selected": true
359+
"icon": new com.jformdesigner.model.SwingIcon( 0, "/com/formdev/flatlaf/demo/icons/show.svg" )
360+
} )
339361
add( new FormComponent( "javax.swing.JPopupMenu$Separator" ) {
340362
name: "separator8"
341363
} )
@@ -450,6 +472,14 @@ new FormModel {
450472
}
451473
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "animatedLafChangeChanged", false ) )
452474
} )
475+
add( new FormComponent( "javax.swing.JCheckBoxMenuItem" ) {
476+
name: "showMenuCheckIconsSeparately"
477+
"text": "Show check menu icons separately"
478+
auxiliary() {
479+
"JavaCodeGenerator.variableLocal": false
480+
}
481+
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "showCheckMenuIconsSeparately", false ) )
482+
} )
453483
add( new FormComponent( "javax.swing.JMenuItem" ) {
454484
name: "showHintsMenuItem"
455485
"text": "Show hints"

‎flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,7 @@ MenuItem.border
550550
MenuItem.borderPainted
551551
MenuItem.checkBackground
552552
MenuItem.checkMargins
553+
MenuItem.checkIconSeparated
553554
MenuItem.disabledForeground
554555
MenuItem.font
555556
MenuItem.foreground

0 commit comments

Comments
 (0)