From d2f16dcaf351625abe41b06bf00ebcfab02a33e5 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Tue, 5 May 2020 12:31:33 +0200 Subject: [PATCH] Menus: - added 1px to menu item top and bottom margin - changed gap between menu item icon and text from 4 to 6 - improved colors of checked menu items that have a icon (issue #96) --- .../flatlaf/ui/FlatCheckBoxMenuItemUI.java | 19 ++++-------- .../flatlaf/ui/FlatMenuItemRenderer.java | 29 ++++++++++++++----- .../formdev/flatlaf/ui/FlatMenuItemUI.java | 12 ++++---- .../com/formdev/flatlaf/ui/FlatMenuUI.java | 13 ++++----- .../flatlaf/ui/FlatRadioButtonMenuItemUI.java | 19 ++++-------- .../formdev/flatlaf/FlatDarkLaf.properties | 3 +- .../com/formdev/flatlaf/FlatLaf.properties | 8 +++-- .../formdev/flatlaf/FlatLightLaf.properties | 3 +- .../uidefaults/FlatDarkLaf_1.8.0_202-mac.txt | 14 +++++---- .../uidefaults/FlatDarkLaf_1.8.0_202.txt | 14 +++++---- .../uidefaults/FlatLightLaf_1.8.0_202-mac.txt | 14 +++++---- .../uidefaults/FlatLightLaf_1.8.0_202.txt | 14 +++++---- 12 files changed, 83 insertions(+), 79 deletions(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatCheckBoxMenuItemUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatCheckBoxMenuItemUI.java index 00526c0f..5bcb2f88 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatCheckBoxMenuItemUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatCheckBoxMenuItemUI.java @@ -16,12 +16,11 @@ package com.formdev.flatlaf.ui; -import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics; import javax.swing.Icon; import javax.swing.JComponent; -import javax.swing.UIManager; +import javax.swing.LookAndFeel; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicCheckBoxMenuItemUI; @@ -49,21 +48,13 @@ import javax.swing.plaf.basic.BasicCheckBoxMenuItemUI; * * * - * @uiDefault CheckBoxMenuItem.checkBackground Color - * - * - * - * @uiDefault MenuItem.minimumIconSize Dimension - * @uiDefault MenuItem.textAcceleratorGap int - * @uiDefault MenuItem.textNoAcceleratorGap int - * @uiDefault MenuItem.acceleratorArrowGap int + * @uiDefault MenuItem.iconTextGap int * * @author Karl Tauber */ public class FlatCheckBoxMenuItemUI extends BasicCheckBoxMenuItemUI { - private Color checkBackground; private FlatMenuItemRenderer renderer; public static ComponentUI createUI( JComponent c ) { @@ -74,7 +65,8 @@ public class FlatCheckBoxMenuItemUI protected void installDefaults() { super.installDefaults(); - checkBackground = UIManager.getColor( "CheckBoxMenuItem.checkBackground" ); + LookAndFeel.installProperty( menuItem, "iconTextGap", FlatUIUtils.getUIInt( "MenuItem.iconTextGap", 4 ) ); + renderer = createRenderer(); } @@ -82,7 +74,6 @@ public class FlatCheckBoxMenuItemUI protected void uninstallDefaults() { super.uninstallDefaults(); - checkBackground = null; renderer = null; } @@ -98,6 +89,6 @@ public class FlatCheckBoxMenuItemUI @Override public void paint( Graphics g, JComponent c ) { renderer.paintMenuItem( g, selectionBackground, selectionForeground, disabledForeground, - checkBackground, acceleratorForeground, acceleratorSelectionForeground ); + acceleratorForeground, acceleratorSelectionForeground ); } } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemRenderer.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemRenderer.java index 9ca67ed9..4bd7107c 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemRenderer.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemRenderer.java @@ -44,6 +44,17 @@ import com.formdev.flatlaf.util.Graphics2DProxy; /** * Renderer for menu items. * + * @uiDefault MenuItem.minimumWidth int + * @uiDefault MenuItem.minimumIconSize Dimension + * @uiDefault MenuItem.textAcceleratorGap int + * @uiDefault MenuItem.textNoAcceleratorGap int + * @uiDefault MenuItem.acceleratorArrowGap int + * @uiDefault MenuItem.checkBackground Color + * @uiDefault MenuItem.underlineSelectionBackground Color + * @uiDefault MenuItem.underlineSelectionCheckBackground Color + * @uiDefault MenuItem.underlineSelectionColor Color + * @uiDefault MenuItem.underlineSelectionHeight Color + * * @author Karl Tauber */ public class FlatMenuItemRenderer @@ -60,7 +71,11 @@ public class FlatMenuItemRenderer protected final int textNoAcceleratorGap = FlatUIUtils.getUIInt( "MenuItem.textNoAcceleratorGap", 6 ); protected final int acceleratorArrowGap = FlatUIUtils.getUIInt( "MenuItem.acceleratorArrowGap", 2 ); + protected final Color checkBackground = UIManager.getColor( "MenuItem.checkBackground" ); + protected final Insets checkMargins = UIManager.getInsets( "MenuItem.checkMargins" ); + protected final Color underlineSelectionBackground = UIManager.getColor( "MenuItem.underlineSelectionBackground" ); + protected final Color underlineSelectionCheckBackground = UIManager.getColor( "MenuItem.underlineSelectionCheckBackground" ); protected final Color underlineSelectionColor = UIManager.getColor( "MenuItem.underlineSelectionColor" ); protected final int underlineSelectionHeight = UIManager.getInt( "MenuItem.underlineSelectionHeight" ); @@ -201,8 +216,7 @@ public class FlatMenuItemRenderer } protected void paintMenuItem( Graphics g, Color selectionBackground, Color selectionForeground, - Color disabledForeground, Color checkBackground, - Color acceleratorForeground, Color acceleratorSelectionForeground ) + Color disabledForeground, Color acceleratorForeground, Color acceleratorSelectionForeground ) { Rectangle viewRect = new Rectangle( menuItem.getWidth(), menuItem.getHeight() ); @@ -231,7 +245,7 @@ public class FlatMenuItemRenderer debug*/ paintBackground( g, selectionBackground ); - paintIcon( g, iconRect, getIconForPainting(), checkBackground ); + paintIcon( g, iconRect, getIconForPainting() ); paintText( g, textRect, menuItem.getText(), selectionForeground, disabledForeground ); paintAccelerator( g, accelRect, getAcceleratorText(), acceleratorForeground, acceleratorSelectionForeground, disabledForeground ); if( !isTopLevelMenu( menuItem ) ) @@ -268,14 +282,13 @@ debug*/ } } - protected void paintIcon( Graphics g, Rectangle iconRect, Icon icon, Color checkBackground ) { + protected void paintIcon( Graphics g, Rectangle iconRect, Icon icon ) { // if checkbox/radiobutton menu item is selected and also has a custom icon, // then use filled icon background to indicate selection (instead of using checkIcon) if( menuItem.isSelected() && checkIcon != null && icon != checkIcon ) { - int outset = scale( Math.max( menuItem.getIconTextGap() / 2, 2 ) ); - g.setColor( checkBackground ); - g.fillRect( iconRect.x - outset, iconRect.y - outset, - iconRect.width + (outset * 2), iconRect.height + (outset * 2) ); + Rectangle r = FlatUIUtils.addInsets( iconRect, scale( checkMargins ) ); + g.setColor( isUnderlineSelection() ? underlineSelectionCheckBackground : checkBackground ); + g.fillRect( r.x, r.y, r.width, r.height ); } paintIcon( g, menuItem, icon, iconRect ); diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemUI.java index f88cb372..78ae0d9e 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemUI.java @@ -20,6 +20,7 @@ import java.awt.Dimension; import java.awt.Graphics; import javax.swing.Icon; import javax.swing.JComponent; +import javax.swing.LookAndFeel; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicMenuItemUI; @@ -45,12 +46,9 @@ import javax.swing.plaf.basic.BasicMenuItemUI; * @uiDefault MenuItem.checkIcon Icon * @uiDefault MenuItem.opaque boolean * - * + * * - * @uiDefault MenuItem.minimumIconSize Dimension - * @uiDefault MenuItem.textAcceleratorGap int - * @uiDefault MenuItem.textNoAcceleratorGap int - * @uiDefault MenuItem.acceleratorArrowGap int + * @uiDefault MenuItem.iconTextGap int * * @author Karl Tauber */ @@ -67,6 +65,8 @@ public class FlatMenuItemUI protected void installDefaults() { super.installDefaults(); + LookAndFeel.installProperty( menuItem, "iconTextGap", FlatUIUtils.getUIInt( "MenuItem.iconTextGap", 4 ) ); + renderer = createRenderer(); } @@ -89,6 +89,6 @@ public class FlatMenuItemUI @Override public void paint( Graphics g, JComponent c ) { renderer.paintMenuItem( g, selectionBackground, selectionForeground, disabledForeground, - null, acceleratorForeground, acceleratorSelectionForeground ); + acceleratorForeground, acceleratorSelectionForeground ); } } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuUI.java index 7600c054..7ceae19c 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuUI.java @@ -26,6 +26,7 @@ import javax.swing.Icon; import javax.swing.JComponent; import javax.swing.JMenu; import javax.swing.JMenuItem; +import javax.swing.LookAndFeel; import javax.swing.UIManager; import javax.swing.event.MouseInputListener; import javax.swing.plaf.ComponentUI; @@ -58,15 +59,9 @@ import javax.swing.plaf.basic.BasicMenuUI; * * * + * @uiDefault MenuItem.iconTextGap int * @uiDefault MenuBar.hoverBackground Color * - * - * - * @uiDefault MenuItem.minimumIconSize Dimension - * @uiDefault MenuItem.textAcceleratorGap int - * @uiDefault MenuItem.textNoAcceleratorGap int - * @uiDefault MenuItem.acceleratorArrowGap int - * * @author Karl Tauber */ public class FlatMenuUI @@ -83,6 +78,8 @@ public class FlatMenuUI protected void installDefaults() { super.installDefaults(); + LookAndFeel.installProperty( menuItem, "iconTextGap", FlatUIUtils.getUIInt( "MenuItem.iconTextGap", 4 ) ); + menuItem.setRolloverEnabled( true ); hoverBackground = UIManager.getColor( "MenuBar.hoverBackground" ); @@ -134,7 +131,7 @@ public class FlatMenuUI @Override public void paint( Graphics g, JComponent c ) { renderer.paintMenuItem( g, selectionBackground, selectionForeground, disabledForeground, - null, acceleratorForeground, acceleratorSelectionForeground ); + acceleratorForeground, acceleratorSelectionForeground ); } //---- class FlatMenuRenderer --------------------------------------------- diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonMenuItemUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonMenuItemUI.java index 970674bd..5f65012c 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonMenuItemUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonMenuItemUI.java @@ -16,12 +16,11 @@ package com.formdev.flatlaf.ui; -import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics; import javax.swing.Icon; import javax.swing.JComponent; -import javax.swing.UIManager; +import javax.swing.LookAndFeel; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicRadioButtonMenuItemUI; @@ -49,21 +48,13 @@ import javax.swing.plaf.basic.BasicRadioButtonMenuItemUI; * * * - * @uiDefault RadioButtonMenuItem.checkBackground Color - * - * - * - * @uiDefault MenuItem.minimumIconSize Dimension - * @uiDefault MenuItem.textAcceleratorGap int - * @uiDefault MenuItem.textNoAcceleratorGap int - * @uiDefault MenuItem.acceleratorArrowGap int + * @uiDefault MenuItem.iconTextGap int * * @author Karl Tauber */ public class FlatRadioButtonMenuItemUI extends BasicRadioButtonMenuItemUI { - private Color checkBackground; private FlatMenuItemRenderer renderer; public static ComponentUI createUI( JComponent c ) { @@ -74,7 +65,8 @@ public class FlatRadioButtonMenuItemUI protected void installDefaults() { super.installDefaults(); - checkBackground = UIManager.getColor( "RadioButtonMenuItem.checkBackground" ); + LookAndFeel.installProperty( menuItem, "iconTextGap", FlatUIUtils.getUIInt( "MenuItem.iconTextGap", 4 ) ); + renderer = createRenderer(); } @@ -82,7 +74,6 @@ public class FlatRadioButtonMenuItemUI protected void uninstallDefaults() { super.uninstallDefaults(); - checkBackground = null; renderer = null; } @@ -98,6 +89,6 @@ public class FlatRadioButtonMenuItemUI @Override public void paint( Graphics g, JComponent c ) { renderer.paintMenuItem( g, selectionBackground, selectionForeground, disabledForeground, - checkBackground, acceleratorForeground, acceleratorSelectionForeground ); + acceleratorForeground, acceleratorSelectionForeground ); } } diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties index 6cc37334..db0c1d7d 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties @@ -30,7 +30,8 @@ @textComponentBackground=#45494A @menuBackground=darken(@background,5%) @menuHoverBackground=lighten(@menuBackground,10%) -@menuCheckBackground=lighten(@menuBackground,15%) +@menuCheckBackground=lighten(@menuBackground,10%) +@menuCheckHoverBackground=lighten(@menuBackground,20%) @cellFocusColor=#000000 @icon=#adadad diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties index c5723721..e2819cab 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties @@ -64,7 +64,7 @@ ViewportUI=com.formdev.flatlaf.ui.FlatViewportUI #---- variables ---- @textComponentMargin=2,6,2,6 -@menuItemMargin=2,6,2,6 +@menuItemMargin=3,6,3,6 #---- system colors ---- @@ -165,7 +165,6 @@ CheckBoxMenuItem.margin=@menuItemMargin CheckBoxMenuItem.opaque=false CheckBoxMenuItem.borderPainted=true CheckBoxMenuItem.background=@menuBackground -CheckBoxMenuItem.checkBackground=@menuCheckBackground #---- ColorChooser ---- @@ -312,8 +311,11 @@ MenuItem.margin=@menuItemMargin MenuItem.opaque=false MenuItem.borderPainted=true MenuItem.background=@menuBackground +MenuItem.checkBackground=@menuCheckBackground +MenuItem.checkMargins=3,3,3,3 MenuItem.minimumWidth=72 MenuItem.minimumIconSize=16,16 +MenuItem.iconTextGap=6 MenuItem.textAcceleratorGap=24 MenuItem.textNoAcceleratorGap=6 MenuItem.acceleratorArrowGap=2 @@ -322,6 +324,7 @@ MenuItem.acceleratorDelimiter=- # for MenuItem.selectionType=underline MenuItem.underlineSelectionBackground=@menuHoverBackground +MenuItem.underlineSelectionCheckBackground=@menuCheckHoverBackground MenuItem.underlineSelectionColor=$TabbedPane.underlineColor MenuItem.underlineSelectionHeight=3 @@ -402,7 +405,6 @@ RadioButtonMenuItem.margin=@menuItemMargin RadioButtonMenuItem.opaque=false RadioButtonMenuItem.borderPainted=true RadioButtonMenuItem.background=@menuBackground -RadioButtonMenuItem.checkBackground=@menuCheckBackground #---- ScrollBar ---- diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties index 12e9bc61..d38e68cb 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties @@ -30,7 +30,8 @@ @textComponentBackground=#ffffff @menuBackground=#fff @menuHoverBackground=darken(@menuBackground,10%) -@menuCheckBackground=darken(@menuBackground,15%) +@menuCheckBackground=darken(@menuBackground,10%) +@menuCheckHoverBackground=darken(@menuBackground,20%) @cellFocusColor=#000000 @icon=#afafaf diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt index 80b29cd1..6b8f121b 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt @@ -144,12 +144,11 @@ CheckBoxMenuItem.arrowIcon [lazy] 6,10 com.formdev.flatlaf.icons.FlatMenu CheckBoxMenuItem.background #303234 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] CheckBoxMenuItem.borderPainted true -CheckBoxMenuItem.checkBackground #55585c javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.checkIcon [lazy] 15,15 com.formdev.flatlaf.icons.FlatCheckBoxMenuItemIcon [UI] CheckBoxMenuItem.disabledForeground #777777 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.font [active] $defaultFont [UI] CheckBoxMenuItem.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -CheckBoxMenuItem.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] +CheckBoxMenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] CheckBoxMenuItem.opaque false CheckBoxMenuItem.selectionBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] @@ -476,7 +475,7 @@ Menu.font [active] $defaultFont [UI] Menu.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] Menu.icon.arrowColor #a7a7a7 javax.swing.plaf.ColorUIResource [UI] Menu.icon.disabledArrowColor #606060 javax.swing.plaf.ColorUIResource [UI] -Menu.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] +Menu.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] Menu.menuPopupOffsetX 0 Menu.menuPopupOffsetY 0 Menu.opaque false @@ -517,10 +516,13 @@ MenuItem.arrowIcon [lazy] 6,10 com.formdev.flatlaf.icons.FlatMenu MenuItem.background #303234 javax.swing.plaf.ColorUIResource [UI] MenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] MenuItem.borderPainted true +MenuItem.checkBackground #484c4f javax.swing.plaf.ColorUIResource [UI] +MenuItem.checkMargins 3,3,3,3 javax.swing.plaf.InsetsUIResource [UI] MenuItem.disabledForeground #777777 javax.swing.plaf.ColorUIResource [UI] MenuItem.font [active] $defaultFont [UI] MenuItem.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -MenuItem.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] +MenuItem.iconTextGap 6 +MenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] MenuItem.minimumIconSize 16,16 javax.swing.plaf.DimensionUIResource [UI] MenuItem.minimumWidth 72 MenuItem.opaque false @@ -529,6 +531,7 @@ MenuItem.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] MenuItem.textAcceleratorGap 24 MenuItem.textNoAcceleratorGap 6 MenuItem.underlineSelectionBackground #484c4f javax.swing.plaf.ColorUIResource [UI] +MenuItem.underlineSelectionCheckBackground #616569 javax.swing.plaf.ColorUIResource [UI] MenuItem.underlineSelectionColor #4a88c7 javax.swing.plaf.ColorUIResource [UI] MenuItem.underlineSelectionHeight 3 @@ -698,12 +701,11 @@ RadioButtonMenuItem.arrowIcon [lazy] 6,10 com.formdev.flatlaf.icons.FlatMenu RadioButtonMenuItem.background #303234 javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] RadioButtonMenuItem.borderPainted true -RadioButtonMenuItem.checkBackground #55585c javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.checkIcon [lazy] 15,15 com.formdev.flatlaf.icons.FlatRadioButtonMenuItemIcon [UI] RadioButtonMenuItem.disabledForeground #777777 javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.font [active] $defaultFont [UI] RadioButtonMenuItem.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -RadioButtonMenuItem.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] +RadioButtonMenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] RadioButtonMenuItem.opaque false RadioButtonMenuItem.selectionBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt index efa56545..0f2d2feb 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt @@ -144,12 +144,11 @@ CheckBoxMenuItem.arrowIcon [lazy] 6,10 com.formdev.flatlaf.icons.FlatMenu CheckBoxMenuItem.background #303234 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] CheckBoxMenuItem.borderPainted true -CheckBoxMenuItem.checkBackground #55585c javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.checkIcon [lazy] 15,15 com.formdev.flatlaf.icons.FlatCheckBoxMenuItemIcon [UI] CheckBoxMenuItem.disabledForeground #777777 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.font [active] $defaultFont [UI] CheckBoxMenuItem.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -CheckBoxMenuItem.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] +CheckBoxMenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] CheckBoxMenuItem.opaque false CheckBoxMenuItem.selectionBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] @@ -475,7 +474,7 @@ Menu.font [active] $defaultFont [UI] Menu.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] Menu.icon.arrowColor #a7a7a7 javax.swing.plaf.ColorUIResource [UI] Menu.icon.disabledArrowColor #606060 javax.swing.plaf.ColorUIResource [UI] -Menu.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] +Menu.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] Menu.menuPopupOffsetX 0 Menu.menuPopupOffsetY 0 Menu.opaque false @@ -516,10 +515,13 @@ MenuItem.arrowIcon [lazy] 6,10 com.formdev.flatlaf.icons.FlatMenu MenuItem.background #303234 javax.swing.plaf.ColorUIResource [UI] MenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] MenuItem.borderPainted true +MenuItem.checkBackground #484c4f javax.swing.plaf.ColorUIResource [UI] +MenuItem.checkMargins 3,3,3,3 javax.swing.plaf.InsetsUIResource [UI] MenuItem.disabledForeground #777777 javax.swing.plaf.ColorUIResource [UI] MenuItem.font [active] $defaultFont [UI] MenuItem.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -MenuItem.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] +MenuItem.iconTextGap 6 +MenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] MenuItem.minimumIconSize 16,16 javax.swing.plaf.DimensionUIResource [UI] MenuItem.minimumWidth 72 MenuItem.opaque false @@ -528,6 +530,7 @@ MenuItem.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] MenuItem.textAcceleratorGap 24 MenuItem.textNoAcceleratorGap 6 MenuItem.underlineSelectionBackground #484c4f javax.swing.plaf.ColorUIResource [UI] +MenuItem.underlineSelectionCheckBackground #616569 javax.swing.plaf.ColorUIResource [UI] MenuItem.underlineSelectionColor #4a88c7 javax.swing.plaf.ColorUIResource [UI] MenuItem.underlineSelectionHeight 3 @@ -696,12 +699,11 @@ RadioButtonMenuItem.arrowIcon [lazy] 6,10 com.formdev.flatlaf.icons.FlatMenu RadioButtonMenuItem.background #303234 javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] RadioButtonMenuItem.borderPainted true -RadioButtonMenuItem.checkBackground #55585c javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.checkIcon [lazy] 15,15 com.formdev.flatlaf.icons.FlatRadioButtonMenuItemIcon [UI] RadioButtonMenuItem.disabledForeground #777777 javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.font [active] $defaultFont [UI] RadioButtonMenuItem.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -RadioButtonMenuItem.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] +RadioButtonMenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] RadioButtonMenuItem.opaque false RadioButtonMenuItem.selectionBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt index db8adf87..cd49824c 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt @@ -145,12 +145,11 @@ CheckBoxMenuItem.arrowIcon [lazy] 6,10 com.formdev.flatlaf.icons.FlatMenu CheckBoxMenuItem.background #ffffff javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] CheckBoxMenuItem.borderPainted true -CheckBoxMenuItem.checkBackground #d9d9d9 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.checkIcon [lazy] 15,15 com.formdev.flatlaf.icons.FlatCheckBoxMenuItemIcon [UI] CheckBoxMenuItem.disabledForeground #8c8c8c javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.font [active] $defaultFont [UI] CheckBoxMenuItem.foreground #000000 javax.swing.plaf.ColorUIResource [UI] -CheckBoxMenuItem.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] +CheckBoxMenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] CheckBoxMenuItem.opaque false CheckBoxMenuItem.selectionBackground #2675bf javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.selectionForeground #ffffff javax.swing.plaf.ColorUIResource [UI] @@ -478,7 +477,7 @@ Menu.font [active] $defaultFont [UI] Menu.foreground #000000 javax.swing.plaf.ColorUIResource [UI] Menu.icon.arrowColor #666666 javax.swing.plaf.ColorUIResource [UI] Menu.icon.disabledArrowColor #ababab javax.swing.plaf.ColorUIResource [UI] -Menu.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] +Menu.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] Menu.menuPopupOffsetX 0 Menu.menuPopupOffsetY 0 Menu.opaque false @@ -519,10 +518,13 @@ MenuItem.arrowIcon [lazy] 6,10 com.formdev.flatlaf.icons.FlatMenu MenuItem.background #ffffff javax.swing.plaf.ColorUIResource [UI] MenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] MenuItem.borderPainted true +MenuItem.checkBackground #e6e6e6 javax.swing.plaf.ColorUIResource [UI] +MenuItem.checkMargins 3,3,3,3 javax.swing.plaf.InsetsUIResource [UI] MenuItem.disabledForeground #8c8c8c javax.swing.plaf.ColorUIResource [UI] MenuItem.font [active] $defaultFont [UI] MenuItem.foreground #000000 javax.swing.plaf.ColorUIResource [UI] -MenuItem.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] +MenuItem.iconTextGap 6 +MenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] MenuItem.minimumIconSize 16,16 javax.swing.plaf.DimensionUIResource [UI] MenuItem.minimumWidth 72 MenuItem.opaque false @@ -531,6 +533,7 @@ MenuItem.selectionForeground #ffffff javax.swing.plaf.ColorUIResource [UI] MenuItem.textAcceleratorGap 24 MenuItem.textNoAcceleratorGap 6 MenuItem.underlineSelectionBackground #e6e6e6 javax.swing.plaf.ColorUIResource [UI] +MenuItem.underlineSelectionCheckBackground #cccccc javax.swing.plaf.ColorUIResource [UI] MenuItem.underlineSelectionColor #4083c9 javax.swing.plaf.ColorUIResource [UI] MenuItem.underlineSelectionHeight 3 @@ -700,12 +703,11 @@ RadioButtonMenuItem.arrowIcon [lazy] 6,10 com.formdev.flatlaf.icons.FlatMenu RadioButtonMenuItem.background #ffffff javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] RadioButtonMenuItem.borderPainted true -RadioButtonMenuItem.checkBackground #d9d9d9 javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.checkIcon [lazy] 15,15 com.formdev.flatlaf.icons.FlatRadioButtonMenuItemIcon [UI] RadioButtonMenuItem.disabledForeground #8c8c8c javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.font [active] $defaultFont [UI] RadioButtonMenuItem.foreground #000000 javax.swing.plaf.ColorUIResource [UI] -RadioButtonMenuItem.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] +RadioButtonMenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] RadioButtonMenuItem.opaque false RadioButtonMenuItem.selectionBackground #2675bf javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.selectionForeground #ffffff javax.swing.plaf.ColorUIResource [UI] diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt index 2099b21d..c832b0b8 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt @@ -145,12 +145,11 @@ CheckBoxMenuItem.arrowIcon [lazy] 6,10 com.formdev.flatlaf.icons.FlatMenu CheckBoxMenuItem.background #ffffff javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] CheckBoxMenuItem.borderPainted true -CheckBoxMenuItem.checkBackground #d9d9d9 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.checkIcon [lazy] 15,15 com.formdev.flatlaf.icons.FlatCheckBoxMenuItemIcon [UI] CheckBoxMenuItem.disabledForeground #8c8c8c javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.font [active] $defaultFont [UI] CheckBoxMenuItem.foreground #000000 javax.swing.plaf.ColorUIResource [UI] -CheckBoxMenuItem.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] +CheckBoxMenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] CheckBoxMenuItem.opaque false CheckBoxMenuItem.selectionBackground #2675bf javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.selectionForeground #ffffff javax.swing.plaf.ColorUIResource [UI] @@ -477,7 +476,7 @@ Menu.font [active] $defaultFont [UI] Menu.foreground #000000 javax.swing.plaf.ColorUIResource [UI] Menu.icon.arrowColor #666666 javax.swing.plaf.ColorUIResource [UI] Menu.icon.disabledArrowColor #ababab javax.swing.plaf.ColorUIResource [UI] -Menu.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] +Menu.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] Menu.menuPopupOffsetX 0 Menu.menuPopupOffsetY 0 Menu.opaque false @@ -518,10 +517,13 @@ MenuItem.arrowIcon [lazy] 6,10 com.formdev.flatlaf.icons.FlatMenu MenuItem.background #ffffff javax.swing.plaf.ColorUIResource [UI] MenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] MenuItem.borderPainted true +MenuItem.checkBackground #e6e6e6 javax.swing.plaf.ColorUIResource [UI] +MenuItem.checkMargins 3,3,3,3 javax.swing.plaf.InsetsUIResource [UI] MenuItem.disabledForeground #8c8c8c javax.swing.plaf.ColorUIResource [UI] MenuItem.font [active] $defaultFont [UI] MenuItem.foreground #000000 javax.swing.plaf.ColorUIResource [UI] -MenuItem.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] +MenuItem.iconTextGap 6 +MenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] MenuItem.minimumIconSize 16,16 javax.swing.plaf.DimensionUIResource [UI] MenuItem.minimumWidth 72 MenuItem.opaque false @@ -530,6 +532,7 @@ MenuItem.selectionForeground #ffffff javax.swing.plaf.ColorUIResource [UI] MenuItem.textAcceleratorGap 24 MenuItem.textNoAcceleratorGap 6 MenuItem.underlineSelectionBackground #e6e6e6 javax.swing.plaf.ColorUIResource [UI] +MenuItem.underlineSelectionCheckBackground #cccccc javax.swing.plaf.ColorUIResource [UI] MenuItem.underlineSelectionColor #4083c9 javax.swing.plaf.ColorUIResource [UI] MenuItem.underlineSelectionHeight 3 @@ -698,12 +701,11 @@ RadioButtonMenuItem.arrowIcon [lazy] 6,10 com.formdev.flatlaf.icons.FlatMenu RadioButtonMenuItem.background #ffffff javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] RadioButtonMenuItem.borderPainted true -RadioButtonMenuItem.checkBackground #d9d9d9 javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.checkIcon [lazy] 15,15 com.formdev.flatlaf.icons.FlatRadioButtonMenuItemIcon [UI] RadioButtonMenuItem.disabledForeground #8c8c8c javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.font [active] $defaultFont [UI] RadioButtonMenuItem.foreground #000000 javax.swing.plaf.ColorUIResource [UI] -RadioButtonMenuItem.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] +RadioButtonMenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] RadioButtonMenuItem.opaque false RadioButtonMenuItem.selectionBackground #2675bf javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.selectionForeground #ffffff javax.swing.plaf.ColorUIResource [UI]