From aa9263a2e79e9ef04bdd9e8379c088a1c76db36c Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Thu, 9 Jun 2022 21:15:52 +0200 Subject: [PATCH] macOS themes: use rounded selection for menus and combo boxes; fixed menus and combo box selection colors (issue #497) --- .../formdev/flatlaf/FlatDarkLaf.properties | 3 +- .../formdev/flatlaf/FlatLightLaf.properties | 3 +- .../flatlaf/themes/FlatMacDarkLaf.properties | 33 +++++++++++++++ .../flatlaf/themes/FlatMacLightLaf.properties | 34 +++++++++++++++ .../resources/DerivedColorKeys.properties | 1 + .../dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt | 42 +++++++++++++------ .../uidefaults/FlatMacLightLaf_1.8.0.txt | 42 +++++++++++++------ 7 files changed, 130 insertions(+), 28 deletions(-) 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 d1793403e..7ef63e19c 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties @@ -50,8 +50,9 @@ @selectionInactiveForeground = @foreground # menu +@menuSelectionBackground = @selectionBackground @menuHoverBackground = lighten(@menuBackground,10%,derived) -@menuCheckBackground = darken(@selectionBackground,10%,derived noAutoInverse) +@menuCheckBackground = darken(@menuSelectionBackground,10%,derived noAutoInverse) @menuAcceleratorForeground = darken(@foreground,15%) @menuAcceleratorSelectionForeground = @selectionForeground 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 157b39082..cad239847 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties @@ -50,8 +50,9 @@ @selectionInactiveForeground = @foreground # menu +@menuSelectionBackground = @selectionBackground @menuHoverBackground = darken(@menuBackground,10%,derived) -@menuCheckBackground = lighten(@selectionBackground,40%,derived noAutoInverse) +@menuCheckBackground = lighten(@menuSelectionBackground,40%,derived noAutoInverse) @menuAcceleratorForeground = lighten(@foreground,30%) @menuAcceleratorSelectionForeground = @selectionForeground diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacDarkLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacDarkLaf.properties index 5d73e7e7d..f07f64b3d 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacDarkLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacDarkLaf.properties @@ -96,6 +96,10 @@ @textSelectionBackground = @nsSelectedTextBackgroundColor @textSelectionForeground = @nsSelectedTextColor +# menu +@menuSelectionBackground = desaturate(@selectionBackground,20%) +@menuItemMargin = 3,11,3,11 + # accent colors (blueish) @accentColor = @nsControlAccentColor @accentFocusColor = @nsKeyboardFocusIndicatorColor @@ -141,6 +145,10 @@ ComboBox.buttonArrowColor = @nsSelectedMenuItemTextColor ComboBox.buttonHoverArrowColor = darken($ComboBox.buttonArrowColor,15%,derived noAutoInverse) ComboBox.buttonPressedArrowColor = darken($ComboBox.buttonArrowColor,25%,derived noAutoInverse) ComboBox.popupBackground = @menuBackground +ComboBox.selectionBackground = @menuSelectionBackground +ComboBox.popupInsets = 5,0,5,0 +ComboBox.selectionInsets = 0,5,0,5 +ComboBox.selectionArc = 8 #---- Component ---- @@ -167,6 +175,26 @@ FormattedTextField.selectionBackground = @textSelectionBackground FormattedTextField.selectionForeground = @textSelectionForeground +#---- MenuBar ---- + +MenuBar.selectionInsets = 0,0,0,0 +MenuBar.selectionEmbeddedInsets = 3,0,3,0 +MenuBar.selectionArc = 8 +MenuBar.selectionBackground = lighten(@menuBackground,15%,derived) +MenuBar.selectionForeground = @foreground + + +#---- MenuItem ---- + +MenuItem.selectionInsets = 0,5,0,5 +MenuItem.selectionArc = 8 + +Menu.selectionBackground = @menuSelectionBackground +MenuItem.selectionBackground = @menuSelectionBackground +CheckBoxMenuItem.selectionBackground = @menuSelectionBackground +RadioButtonMenuItem.selectionBackground = @menuSelectionBackground + + #---- PasswordField --- PasswordField.disabledBackground = @disabledComponentBackground @@ -174,6 +202,11 @@ PasswordField.selectionBackground = @textSelectionBackground PasswordField.selectionForeground = @textSelectionForeground +#---- PopupMenu ---- + +PopupMenu.borderInsets = 6,1,6,1 + + #---- ProgressBar ---- ProgressBar.background = lighten(@background,8%) diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacLightLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacLightLaf.properties index 6c008cf2a..67e382bf0 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacLightLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacLightLaf.properties @@ -96,6 +96,11 @@ @textSelectionBackground = @nsSelectedTextBackgroundColor @textSelectionForeground = @foreground +# menu +@menuSelectionBackground = lighten(@accentColor,12%) +@menuCheckBackground = lighten(@menuSelectionBackground,25%,derived noAutoInverse) +@menuItemMargin = 3,11,3,11 + # accent colors (blueish) @accentColor = @nsControlAccentColor @accentFocusColor = @nsKeyboardFocusIndicatorColor @@ -141,6 +146,10 @@ ComboBox.buttonArrowColor = @nsSelectedMenuItemTextColor ComboBox.buttonHoverArrowColor = darken($ComboBox.buttonArrowColor,15%,derived noAutoInverse) ComboBox.buttonPressedArrowColor = darken($ComboBox.buttonArrowColor,25%,derived noAutoInverse) ComboBox.popupBackground = @menuBackground +ComboBox.selectionBackground = @menuSelectionBackground +ComboBox.popupInsets = 5,0,5,0 +ComboBox.selectionInsets = 0,5,0,5 +ComboBox.selectionArc = 8 #---- Component ---- @@ -167,6 +176,26 @@ FormattedTextField.selectionBackground = @textSelectionBackground FormattedTextField.selectionForeground = @textSelectionForeground +#---- MenuBar ---- + +MenuBar.selectionInsets = 0,0,0,0 +MenuBar.selectionEmbeddedInsets = 3,0,3,0 +MenuBar.selectionArc = 8 +MenuBar.selectionBackground = darken(@menuBackground,15%,derived) +MenuBar.selectionForeground = @foreground + + +#---- MenuItem ---- + +MenuItem.selectionInsets = 0,5,0,5 +MenuItem.selectionArc = 8 + +Menu.selectionBackground = @menuSelectionBackground +MenuItem.selectionBackground = @menuSelectionBackground +CheckBoxMenuItem.selectionBackground = @menuSelectionBackground +RadioButtonMenuItem.selectionBackground = @menuSelectionBackground + + #---- PasswordField --- PasswordField.disabledBackground = @disabledComponentBackground @@ -174,6 +203,11 @@ PasswordField.selectionBackground = @textSelectionBackground PasswordField.selectionForeground = @textSelectionForeground +#---- PopupMenu ---- + +PopupMenu.borderInsets = 6,1,6,1 + + #---- ProgressBar ---- ProgressBar.background = darken(@background,5%) diff --git a/flatlaf-extras/src/main/resources/com/formdev/flatlaf/extras/resources/DerivedColorKeys.properties b/flatlaf-extras/src/main/resources/com/formdev/flatlaf/extras/resources/DerivedColorKeys.properties index 1190bc6e0..7a29655d2 100644 --- a/flatlaf-extras/src/main/resources/com/formdev/flatlaf/extras/resources/DerivedColorKeys.properties +++ b/flatlaf-extras/src/main/resources/com/formdev/flatlaf/extras/resources/DerivedColorKeys.properties @@ -117,6 +117,7 @@ Menu.selectionBackground = Menu.background MenuBar.hoverBackground = Menu.background MenuBar.underlineSelectionBackground = Menu.background +MenuBar.selectionBackground = Menu.background #---- MenuItem ---- diff --git a/flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt index 0ccb3f11f..fdc1490db 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt @@ -169,9 +169,9 @@ CheckBoxMenuItem.font [active] $defaultFont [UI] CheckBoxMenuItem.foreground #dddddd HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.icon.checkmarkColor #b7b7b7 HSL 0 0 72 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.icon.disabledCheckmarkColor #777777 HSL 0 0 47 javax.swing.plaf.ColorUIResource [UI] -CheckBoxMenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] +CheckBoxMenuItem.margin 3,11,3,11 javax.swing.plaf.InsetsUIResource [UI] CheckBoxMenuItem.opaque false -CheckBoxMenuItem.selectionBackground #0058d0 HSL 215 100 41 javax.swing.plaf.ColorUIResource [UI] +CheckBoxMenuItem.selectionBackground #155bbb HSL 215 80 41 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.selectionForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItemUI com.formdev.flatlaf.ui.FlatCheckBoxMenuItemUI @@ -226,8 +226,11 @@ ComboBox.minimumWidth 72 ComboBox.noActionOnKeyNavigation false ComboBox.padding 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] ComboBox.popupBackground #323232 HSL 0 0 20 javax.swing.plaf.ColorUIResource [UI] -ComboBox.selectionBackground #0058d0 HSL 215 100 41 javax.swing.plaf.ColorUIResource [UI] +ComboBox.popupInsets 5,0,5,0 javax.swing.plaf.InsetsUIResource [UI] +ComboBox.selectionArc 8 +ComboBox.selectionBackground #155bbb HSL 215 80 41 javax.swing.plaf.ColorUIResource [UI] ComboBox.selectionForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] +ComboBox.selectionInsets 0,5,0,5 javax.swing.plaf.InsetsUIResource [UI] ComboBox.timeFactor 1000 ComboBoxUI com.formdev.flatlaf.ui.FlatComboBoxUI @@ -551,10 +554,12 @@ List.focusSelectedCellHighlightBorder [lazy] 1,6,1,6 false com.formdev.flatl List.font [active] $defaultFont [UI] List.foreground #dddddd HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI] List.noFocusBorder 1,1,1,1 false javax.swing.plaf.BorderUIResource$EmptyBorderUIResource [UI] +List.selectionArc 0 List.selectionBackground #0058d0 HSL 215 100 41 javax.swing.plaf.ColorUIResource [UI] List.selectionForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] List.selectionInactiveBackground #464646 HSL 0 0 27 javax.swing.plaf.ColorUIResource [UI] List.selectionInactiveForeground #dddddd HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI] +List.selectionInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI] List.showCellFocusIndicator false List.timeFactor 1000 ListUI com.formdev.flatlaf.ui.FlatListUI @@ -576,12 +581,12 @@ Menu.font [active] $defaultFont [UI] Menu.foreground #dddddd HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI] Menu.icon.arrowColor #b7b7b7 HSL 0 0 72 javax.swing.plaf.ColorUIResource [UI] Menu.icon.disabledArrowColor #777777 HSL 0 0 47 javax.swing.plaf.ColorUIResource [UI] -Menu.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] +Menu.margin 3,11,3,11 javax.swing.plaf.InsetsUIResource [UI] Menu.menuPopupOffsetX 0 Menu.menuPopupOffsetY 0 Menu.opaque false Menu.preserveTopLevelSelection false -Menu.selectionBackground #0058d0 HSL 215 100 41 javax.swing.plaf.ColorUIResource [UI] +Menu.selectionBackground #155bbb HSL 215 80 41 javax.swing.plaf.ColorUIResource [UI] Menu.selectionForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] Menu.shortcutKeys length=1 [I [0] 8 @@ -599,6 +604,11 @@ MenuBar.foreground #dddddd HSL 0 0 87 javax.swing.plaf.Colo MenuBar.highlight #bfbfbf19 10% HSLA 0 0 75 10 javax.swing.plaf.ColorUIResource [UI] MenuBar.hoverBackground #4c4c4c HSL 0 0 30 com.formdev.flatlaf.util.DerivedColor [UI] lighten(10% autoInverse) MenuBar.itemMargins 3,8,3,8 javax.swing.plaf.InsetsUIResource [UI] +MenuBar.selectionArc 8 +MenuBar.selectionBackground #585858 HSL 0 0 35 com.formdev.flatlaf.util.DerivedColor [UI] lighten(15% autoInverse) +MenuBar.selectionEmbeddedInsets 3,0,3,0 javax.swing.plaf.InsetsUIResource [UI] +MenuBar.selectionForeground #dddddd HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI] +MenuBar.selectionInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI] MenuBar.shadow #ffffff19 10% HSLA 0 0 100 10 javax.swing.plaf.ColorUIResource [UI] MenuBar.windowBindings length=2 [Ljava.lang.Object; [0] F10 @@ -617,22 +627,24 @@ MenuItem.arrowIcon [lazy] 6,10 com.formdev.flatlaf.icons.FlatMenu MenuItem.background #323232 HSL 0 0 20 javax.swing.plaf.ColorUIResource [UI] MenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] MenuItem.borderPainted true -MenuItem.checkBackground #00429d HSL 215 100 31 com.formdev.flatlaf.util.DerivedColor [UI] darken(10%) +MenuItem.checkBackground #10458d HSL 215 80 31 com.formdev.flatlaf.util.DerivedColor [UI] darken(10%) MenuItem.checkMargins 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI] MenuItem.disabledForeground #9a9a9a HSL 0 0 60 javax.swing.plaf.ColorUIResource [UI] MenuItem.font [active] $defaultFont [UI] MenuItem.foreground #dddddd HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI] MenuItem.iconTextGap 6 -MenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] +MenuItem.margin 3,11,3,11 javax.swing.plaf.InsetsUIResource [UI] MenuItem.minimumIconSize 16,16 javax.swing.plaf.DimensionUIResource [UI] MenuItem.minimumWidth 72 MenuItem.opaque false -MenuItem.selectionBackground #0058d0 HSL 215 100 41 javax.swing.plaf.ColorUIResource [UI] +MenuItem.selectionArc 8 +MenuItem.selectionBackground #155bbb HSL 215 80 41 javax.swing.plaf.ColorUIResource [UI] MenuItem.selectionForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] +MenuItem.selectionInsets 0,5,0,5 javax.swing.plaf.InsetsUIResource [UI] MenuItem.textAcceleratorGap 24 MenuItem.textNoAcceleratorGap 6 MenuItem.underlineSelectionBackground #4c4c4c HSL 0 0 30 com.formdev.flatlaf.util.DerivedColor [UI] lighten(10% autoInverse) -MenuItem.underlineSelectionCheckBackground #00429d HSL 215 100 31 com.formdev.flatlaf.util.DerivedColor [UI] darken(10%) +MenuItem.underlineSelectionCheckBackground #10458d HSL 215 80 31 com.formdev.flatlaf.util.DerivedColor [UI] darken(10%) MenuItem.underlineSelectionColor #007aff HSL 211 100 50 javax.swing.plaf.ColorUIResource [UI] MenuItem.underlineSelectionHeight 3 MenuItem.verticallyAlignText true @@ -738,9 +750,9 @@ Popup.dropShadowPainted true #---- PopupMenu ---- PopupMenu.background #323232 HSL 0 0 20 javax.swing.plaf.ColorUIResource [UI] -PopupMenu.border [lazy] 4,1,4,1 false com.formdev.flatlaf.ui.FlatPopupMenuBorder [UI] lineColor=#444444 HSL 0 0 27 javax.swing.plaf.ColorUIResource [UI] lineThickness=1.000000 +PopupMenu.border [lazy] 6,1,6,1 false com.formdev.flatlaf.ui.FlatPopupMenuBorder [UI] lineColor=#444444 HSL 0 0 27 javax.swing.plaf.ColorUIResource [UI] lineThickness=1.000000 PopupMenu.borderColor #444444 HSL 0 0 27 javax.swing.plaf.ColorUIResource [UI] -PopupMenu.borderInsets 4,1,4,1 javax.swing.plaf.InsetsUIResource [UI] +PopupMenu.borderInsets 6,1,6,1 javax.swing.plaf.InsetsUIResource [UI] PopupMenu.consumeEventOnClose false PopupMenu.font [active] $defaultFont [UI] PopupMenu.foreground #dddddd HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI] @@ -814,9 +826,9 @@ RadioButtonMenuItem.checkIcon [lazy] 15,15 com.formdev.flatlaf.icons.FlatRad RadioButtonMenuItem.disabledForeground #9a9a9a HSL 0 0 60 javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.font [active] $defaultFont [UI] RadioButtonMenuItem.foreground #dddddd HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI] -RadioButtonMenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] +RadioButtonMenuItem.margin 3,11,3,11 javax.swing.plaf.InsetsUIResource [UI] RadioButtonMenuItem.opaque false -RadioButtonMenuItem.selectionBackground #0058d0 HSL 215 100 41 javax.swing.plaf.ColorUIResource [UI] +RadioButtonMenuItem.selectionBackground #155bbb HSL 215 80 41 javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.selectionForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItemUI com.formdev.flatlaf.ui.FlatRadioButtonMenuItemUI @@ -1311,6 +1323,8 @@ ToolBar.font [active] $defaultFont [UI] ToolBar.foreground #dddddd HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI] ToolBar.gripColor #cecece HSL 0 0 81 javax.swing.plaf.ColorUIResource [UI] ToolBar.highlight #bfbfbf19 10% HSLA 0 0 75 10 javax.swing.plaf.ColorUIResource [UI] +ToolBar.hoverButtonGroupArc 8 +ToolBar.hoverButtonGroupBackground #262626 HSL 0 0 15 com.formdev.flatlaf.util.DerivedColor [UI] lighten(3% autoInverse) ToolBar.isRollover true ToolBar.light #cccccc19 10% HSLA 0 0 80 10 javax.swing.plaf.ColorUIResource [UI] ToolBar.separatorColor #ffffff19 10% HSLA 0 0 100 10 javax.swing.plaf.ColorUIResource [UI] @@ -1379,11 +1393,13 @@ Tree.repaintWholeRow true Tree.rightChildIndent 11 Tree.rowHeight 0 Tree.scrollsOnExpand true +Tree.selectionArc 0 Tree.selectionBackground #0058d0 HSL 215 100 41 javax.swing.plaf.ColorUIResource [UI] Tree.selectionBorderColor #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI] Tree.selectionForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] Tree.selectionInactiveBackground #464646 HSL 0 0 27 javax.swing.plaf.ColorUIResource [UI] Tree.selectionInactiveForeground #dddddd HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI] +Tree.selectionInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI] Tree.showCellFocusIndicator false Tree.textBackground #282828 HSL 0 0 16 javax.swing.plaf.ColorUIResource [UI] Tree.textForeground #dddddd HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI] diff --git a/flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt index d283fde25..eabce3e7e 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt @@ -174,9 +174,9 @@ CheckBoxMenuItem.font [active] $defaultFont [UI] CheckBoxMenuItem.foreground #262626 HSL 0 0 15 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.icon.checkmarkColor #007aff HSL 211 100 50 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.icon.disabledCheckmarkColor #bdbdbd HSL 0 0 74 javax.swing.plaf.ColorUIResource [UI] -CheckBoxMenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] +CheckBoxMenuItem.margin 3,11,3,11 javax.swing.plaf.InsetsUIResource [UI] CheckBoxMenuItem.opaque false -CheckBoxMenuItem.selectionBackground #0063e1 HSL 214 100 44 javax.swing.plaf.ColorUIResource [UI] +CheckBoxMenuItem.selectionBackground #3d9aff HSL 211 100 62 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.selectionForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItemUI com.formdev.flatlaf.ui.FlatCheckBoxMenuItemUI @@ -230,8 +230,11 @@ ComboBox.minimumWidth 72 ComboBox.noActionOnKeyNavigation false ComboBox.padding 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] ComboBox.popupBackground #ececec HSL 0 0 93 javax.swing.plaf.ColorUIResource [UI] -ComboBox.selectionBackground #0063e1 HSL 214 100 44 javax.swing.plaf.ColorUIResource [UI] +ComboBox.popupInsets 5,0,5,0 javax.swing.plaf.InsetsUIResource [UI] +ComboBox.selectionArc 8 +ComboBox.selectionBackground #3d9aff HSL 211 100 62 javax.swing.plaf.ColorUIResource [UI] ComboBox.selectionForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] +ComboBox.selectionInsets 0,5,0,5 javax.swing.plaf.InsetsUIResource [UI] ComboBox.timeFactor 1000 ComboBoxUI com.formdev.flatlaf.ui.FlatComboBoxUI @@ -555,10 +558,12 @@ List.focusSelectedCellHighlightBorder [lazy] 1,6,1,6 false com.formdev.flatl List.font [active] $defaultFont [UI] List.foreground #262626 HSL 0 0 15 javax.swing.plaf.ColorUIResource [UI] List.noFocusBorder 1,1,1,1 false javax.swing.plaf.BorderUIResource$EmptyBorderUIResource [UI] +List.selectionArc 0 List.selectionBackground #0063e1 HSL 214 100 44 javax.swing.plaf.ColorUIResource [UI] List.selectionForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] List.selectionInactiveBackground #dcdcdc HSL 0 0 86 javax.swing.plaf.ColorUIResource [UI] List.selectionInactiveForeground #262626 HSL 0 0 15 javax.swing.plaf.ColorUIResource [UI] +List.selectionInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI] List.showCellFocusIndicator false List.timeFactor 1000 ListUI com.formdev.flatlaf.ui.FlatListUI @@ -580,12 +585,12 @@ Menu.font [active] $defaultFont [UI] Menu.foreground #262626 HSL 0 0 15 javax.swing.plaf.ColorUIResource [UI] Menu.icon.arrowColor #7d7d7d HSL 0 0 49 javax.swing.plaf.ColorUIResource [UI] Menu.icon.disabledArrowColor #bdbdbd HSL 0 0 74 javax.swing.plaf.ColorUIResource [UI] -Menu.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] +Menu.margin 3,11,3,11 javax.swing.plaf.InsetsUIResource [UI] Menu.menuPopupOffsetX 0 Menu.menuPopupOffsetY 0 Menu.opaque false Menu.preserveTopLevelSelection false -Menu.selectionBackground #0063e1 HSL 214 100 44 javax.swing.plaf.ColorUIResource [UI] +Menu.selectionBackground #3d9aff HSL 211 100 62 javax.swing.plaf.ColorUIResource [UI] Menu.selectionForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] Menu.shortcutKeys length=1 [I [0] 8 @@ -603,6 +608,11 @@ MenuBar.foreground #262626 HSL 0 0 15 javax.swing.plaf.Colo MenuBar.highlight #40404026 15% HSLA 0 0 25 15 javax.swing.plaf.ColorUIResource [UI] MenuBar.hoverBackground #d3d3d3 HSL 0 0 83 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse) MenuBar.itemMargins 3,8,3,8 javax.swing.plaf.InsetsUIResource [UI] +MenuBar.selectionArc 8 +MenuBar.selectionBackground #c6c6c6 HSL 0 0 78 com.formdev.flatlaf.util.DerivedColor [UI] darken(15% autoInverse) +MenuBar.selectionEmbeddedInsets 3,0,3,0 javax.swing.plaf.InsetsUIResource [UI] +MenuBar.selectionForeground #262626 HSL 0 0 15 javax.swing.plaf.ColorUIResource [UI] +MenuBar.selectionInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI] MenuBar.shadow #00000026 15% HSLA 0 0 0 15 javax.swing.plaf.ColorUIResource [UI] MenuBar.windowBindings length=2 [Ljava.lang.Object; [0] F10 @@ -621,22 +631,24 @@ MenuItem.arrowIcon [lazy] 6,10 com.formdev.flatlaf.icons.FlatMenu MenuItem.background #ececec HSL 0 0 93 javax.swing.plaf.ColorUIResource [UI] MenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] MenuItem.borderPainted true -MenuItem.checkBackground #aed2ff HSL 213 100 84 com.formdev.flatlaf.util.DerivedColor [UI] lighten(40%) +MenuItem.checkBackground #bddcff HSL 212 100 87 com.formdev.flatlaf.util.DerivedColor [UI] lighten(25%) MenuItem.checkMargins 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI] MenuItem.disabledForeground #b6b6b6 HSL 0 0 71 javax.swing.plaf.ColorUIResource [UI] MenuItem.font [active] $defaultFont [UI] MenuItem.foreground #262626 HSL 0 0 15 javax.swing.plaf.ColorUIResource [UI] MenuItem.iconTextGap 6 -MenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] +MenuItem.margin 3,11,3,11 javax.swing.plaf.InsetsUIResource [UI] MenuItem.minimumIconSize 16,16 javax.swing.plaf.DimensionUIResource [UI] MenuItem.minimumWidth 72 MenuItem.opaque false -MenuItem.selectionBackground #0063e1 HSL 214 100 44 javax.swing.plaf.ColorUIResource [UI] +MenuItem.selectionArc 8 +MenuItem.selectionBackground #3d9aff HSL 211 100 62 javax.swing.plaf.ColorUIResource [UI] MenuItem.selectionForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] +MenuItem.selectionInsets 0,5,0,5 javax.swing.plaf.InsetsUIResource [UI] MenuItem.textAcceleratorGap 24 MenuItem.textNoAcceleratorGap 6 MenuItem.underlineSelectionBackground #d3d3d3 HSL 0 0 83 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse) -MenuItem.underlineSelectionCheckBackground #aed2ff HSL 213 100 84 com.formdev.flatlaf.util.DerivedColor [UI] lighten(40%) +MenuItem.underlineSelectionCheckBackground #bddcff HSL 212 100 87 com.formdev.flatlaf.util.DerivedColor [UI] lighten(25%) MenuItem.underlineSelectionColor #007aff HSL 211 100 50 javax.swing.plaf.ColorUIResource [UI] MenuItem.underlineSelectionHeight 3 MenuItem.verticallyAlignText true @@ -742,9 +754,9 @@ Popup.dropShadowPainted true #---- PopupMenu ---- PopupMenu.background #ececec HSL 0 0 93 javax.swing.plaf.ColorUIResource [UI] -PopupMenu.border [lazy] 4,1,4,1 false com.formdev.flatlaf.ui.FlatPopupMenuBorder [UI] lineColor=#b1b1b1 HSL 0 0 69 javax.swing.plaf.ColorUIResource [UI] lineThickness=1.000000 +PopupMenu.border [lazy] 6,1,6,1 false com.formdev.flatlaf.ui.FlatPopupMenuBorder [UI] lineColor=#b1b1b1 HSL 0 0 69 javax.swing.plaf.ColorUIResource [UI] lineThickness=1.000000 PopupMenu.borderColor #b1b1b1 HSL 0 0 69 javax.swing.plaf.ColorUIResource [UI] -PopupMenu.borderInsets 4,1,4,1 javax.swing.plaf.InsetsUIResource [UI] +PopupMenu.borderInsets 6,1,6,1 javax.swing.plaf.InsetsUIResource [UI] PopupMenu.consumeEventOnClose false PopupMenu.font [active] $defaultFont [UI] PopupMenu.foreground #262626 HSL 0 0 15 javax.swing.plaf.ColorUIResource [UI] @@ -818,9 +830,9 @@ RadioButtonMenuItem.checkIcon [lazy] 15,15 com.formdev.flatlaf.icons.FlatRad RadioButtonMenuItem.disabledForeground #b6b6b6 HSL 0 0 71 javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.font [active] $defaultFont [UI] RadioButtonMenuItem.foreground #262626 HSL 0 0 15 javax.swing.plaf.ColorUIResource [UI] -RadioButtonMenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] +RadioButtonMenuItem.margin 3,11,3,11 javax.swing.plaf.InsetsUIResource [UI] RadioButtonMenuItem.opaque false -RadioButtonMenuItem.selectionBackground #0063e1 HSL 214 100 44 javax.swing.plaf.ColorUIResource [UI] +RadioButtonMenuItem.selectionBackground #3d9aff HSL 211 100 62 javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.selectionForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItemUI com.formdev.flatlaf.ui.FlatRadioButtonMenuItemUI @@ -1315,6 +1327,8 @@ ToolBar.font [active] $defaultFont [UI] ToolBar.foreground #262626 HSL 0 0 15 javax.swing.plaf.ColorUIResource [UI] ToolBar.gripColor #b4b4b4 HSL 0 0 71 javax.swing.plaf.ColorUIResource [UI] ToolBar.highlight #40404026 15% HSLA 0 0 25 15 javax.swing.plaf.ColorUIResource [UI] +ToolBar.hoverButtonGroupArc 8 +ToolBar.hoverButtonGroupBackground #eeeeee HSL 0 0 93 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse) ToolBar.isRollover true ToolBar.light #1f1f1f26 15% HSLA 0 0 12 15 javax.swing.plaf.ColorUIResource [UI] ToolBar.separatorColor #00000019 10% HSLA 0 0 0 10 javax.swing.plaf.ColorUIResource [UI] @@ -1383,11 +1397,13 @@ Tree.repaintWholeRow true Tree.rightChildIndent 11 Tree.rowHeight 0 Tree.scrollsOnExpand true +Tree.selectionArc 0 Tree.selectionBackground #0063e1 HSL 214 100 44 javax.swing.plaf.ColorUIResource [UI] Tree.selectionBorderColor #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI] Tree.selectionForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] Tree.selectionInactiveBackground #dcdcdc HSL 0 0 86 javax.swing.plaf.ColorUIResource [UI] Tree.selectionInactiveForeground #262626 HSL 0 0 15 javax.swing.plaf.ColorUIResource [UI] +Tree.selectionInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI] Tree.showCellFocusIndicator false Tree.textBackground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] Tree.textForeground #262626 HSL 0 0 15 javax.swing.plaf.ColorUIResource [UI]