diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxMenuItemIcon.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxMenuItemIcon.java index e93702c7..8900db7a 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxMenuItemIcon.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxMenuItemIcon.java @@ -31,8 +31,8 @@ import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; /** * Icon for {@link javax.swing.JCheckBoxMenuItem}. * - * @uiDefault MenuItemCheckBox.icon.checkmarkColor Color - * @uiDefault MenuItemCheckBox.icon.disabledCheckmarkColor Color + * @uiDefault CheckBoxMenuItem.icon.checkmarkColor Color + * @uiDefault CheckBoxMenuItem.icon.disabledCheckmarkColor Color * @uiDefault MenuItem.selectionForeground Color * @uiDefault MenuItem.selectionType String * @@ -41,8 +41,8 @@ import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; public class FlatCheckBoxMenuItemIcon extends FlatAbstractIcon { - @Styleable protected Color checkmarkColor = UIManager.getColor( "MenuItemCheckBox.icon.checkmarkColor" ); - @Styleable protected Color disabledCheckmarkColor = UIManager.getColor( "MenuItemCheckBox.icon.disabledCheckmarkColor" ); + @Styleable protected Color checkmarkColor = UIManager.getColor( "CheckBoxMenuItem.icon.checkmarkColor" ); + @Styleable protected Color disabledCheckmarkColor = UIManager.getColor( "CheckBoxMenuItem.icon.disabledCheckmarkColor" ); @Styleable protected Color selectionForeground = UIManager.getColor( "MenuItem.selectionForeground" ); public FlatCheckBoxMenuItemIcon() { 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 2b00d60d..19bd9622 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties @@ -163,6 +163,12 @@ CheckBox.icon[filled].selectedHoverBackground = darken($CheckBox.icon[filled].se CheckBox.icon[filled].selectedPressedBackground = darken($CheckBox.icon[filled].selectedBackground,6%,derived) +#---- CheckBoxMenuItem ---- + +CheckBoxMenuItem.icon.checkmarkColor = @buttonArrowColor +CheckBoxMenuItem.icon.disabledCheckmarkColor = @buttonDisabledArrowColor + + #---- Component ---- Component.borderColor = tint(@background,19%) @@ -228,12 +234,6 @@ Menu.icon.disabledArrowColor = @buttonDisabledArrowColor MenuBar.borderColor = $Separator.foreground -#---- MenuItemCheckBox ---- - -MenuItemCheckBox.icon.checkmarkColor = @buttonArrowColor -MenuItemCheckBox.icon.disabledCheckmarkColor = @buttonDisabledArrowColor - - #---- PasswordField ---- PasswordField.capsLockIconColor = #ffffff64 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 e5f75f18..aed961da 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties @@ -170,6 +170,12 @@ CheckBox.icon[filled].selectedHoverBackground = darken($CheckBox.icon[filled].se CheckBox.icon[filled].selectedPressedBackground = darken($CheckBox.icon[filled].selectedBackground,10%,derived) +#---- CheckBoxMenuItem ---- + +CheckBoxMenuItem.icon.checkmarkColor = @accentCheckmarkColor +CheckBoxMenuItem.icon.disabledCheckmarkColor = @buttonDisabledArrowColor + + #---- Component ---- Component.borderColor = shade(@background,20%) @@ -235,12 +241,6 @@ Menu.icon.disabledArrowColor = @buttonDisabledArrowColor MenuBar.borderColor = $Separator.foreground -#---- MenuItemCheckBox ---- - -MenuItemCheckBox.icon.checkmarkColor = @accentCheckmarkColor -MenuItemCheckBox.icon.disabledCheckmarkColor = @buttonDisabledArrowColor - - #---- PasswordField ---- PasswordField.capsLockIconColor = #00000064 diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/IntelliJTheme$ThemeLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/IntelliJTheme$ThemeLaf.properties index 89657002..3d68f831 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/IntelliJTheme$ThemeLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/IntelliJTheme$ThemeLaf.properties @@ -60,18 +60,18 @@ Button.hoverBorderColor = null Button.default.hoverBorderColor = null +#---- CheckBoxMenuItem ---- + +# colors from intellij/checkmark.svg and darcula/checkmark.svg +[light]CheckBoxMenuItem.icon.checkmarkColor=#3E3E3C +[dark]CheckBoxMenuItem.icon.checkmarkColor=#fff9 + + #---- HelpButton ---- HelpButton.hoverBorderColor = null -#---- MenuItemCheckBox ---- - -# colors from intellij/checkmark.svg and darcula/checkmark.svg -[light]MenuItemCheckBox.icon.checkmarkColor=#3E3E3C -[dark]MenuItemCheckBox.icon.checkmarkColor=#fff9 - - #---- Slider ---- Slider.focusedColor = fade($Component.focusColor,40%,derived) diff --git a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt index 7d4ea9b8..0fa6c9a8 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt @@ -161,6 +161,8 @@ CheckBoxMenuItem.checkIcon [lazy] 15,15 com.formdev.flatlaf.icons.FlatChe CheckBoxMenuItem.disabledForeground #8c8c8c HSL 0 0 55 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.font [active] $defaultFont [UI] CheckBoxMenuItem.foreground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI] +CheckBoxMenuItem.icon.checkmarkColor #9b9b9b HSL 0 0 61 javax.swing.plaf.ColorUIResource [UI] +CheckBoxMenuItem.icon.disabledCheckmarkColor #5b5b5b HSL 0 0 36 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] CheckBoxMenuItem.opaque false CheckBoxMenuItem.selectionBackground #4b6eaf HSL 219 40 49 javax.swing.plaf.ColorUIResource [UI] @@ -617,16 +619,6 @@ MenuItem.underlineSelectionBackground #484c4f HSL 206 5 30 com.formdev.fl MenuItem.underlineSelectionCheckBackground #3c588b HSL 219 40 39 com.formdev.flatlaf.util.DerivedColor [UI] darken(10%) MenuItem.underlineSelectionColor #4c87c8 HSL 211 53 54 javax.swing.plaf.ColorUIResource [UI] MenuItem.underlineSelectionHeight 3 - - -#---- MenuItemCheckBox ---- - -MenuItemCheckBox.icon.checkmarkColor #9b9b9b HSL 0 0 61 javax.swing.plaf.ColorUIResource [UI] -MenuItemCheckBox.icon.disabledCheckmarkColor #5b5b5b HSL 0 0 36 javax.swing.plaf.ColorUIResource [UI] - - -#---- MenuItem ---- - MenuItemUI com.formdev.flatlaf.ui.FlatMenuItemUI diff --git a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt index 6f4488cf..c0c370f0 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt @@ -165,6 +165,8 @@ CheckBoxMenuItem.checkIcon [lazy] 15,15 com.formdev.flatlaf.icons.FlatChe CheckBoxMenuItem.disabledForeground #8c8c8c HSL 0 0 55 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.font [active] $defaultFont [UI] CheckBoxMenuItem.foreground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI] +CheckBoxMenuItem.icon.checkmarkColor #4e9de7 HSL 209 76 61 javax.swing.plaf.ColorUIResource [UI] +CheckBoxMenuItem.icon.disabledCheckmarkColor #a6a6a6 HSL 0 0 65 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] CheckBoxMenuItem.opaque false CheckBoxMenuItem.selectionBackground #2675bf HSL 209 67 45 javax.swing.plaf.ColorUIResource [UI] @@ -622,16 +624,6 @@ MenuItem.underlineSelectionBackground #e6e6e6 HSL 0 0 90 com.formdev.fl MenuItem.underlineSelectionCheckBackground #bfd9f2 HSL 209 66 85 com.formdev.flatlaf.util.DerivedColor [UI] lighten(40%) MenuItem.underlineSelectionColor #3c83c5 HSL 209 54 50 javax.swing.plaf.ColorUIResource [UI] MenuItem.underlineSelectionHeight 3 - - -#---- MenuItemCheckBox ---- - -MenuItemCheckBox.icon.checkmarkColor #4e9de7 HSL 209 76 61 javax.swing.plaf.ColorUIResource [UI] -MenuItemCheckBox.icon.disabledCheckmarkColor #a6a6a6 HSL 0 0 65 javax.swing.plaf.ColorUIResource [UI] - - -#---- MenuItem ---- - MenuItemUI com.formdev.flatlaf.ui.FlatMenuItemUI diff --git a/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt index c57f4407..12530c2b 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt @@ -162,6 +162,8 @@ CheckBoxMenuItem.checkIcon [lazy] 15,15 com.formdev.flatlaf.icons.FlatChe CheckBoxMenuItem.disabledForeground #000088 HSL 240 100 27 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.font [active] $defaultFont [UI] CheckBoxMenuItem.foreground #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [UI] +CheckBoxMenuItem.icon.checkmarkColor #4d89c9 HSL 211 53 55 javax.swing.plaf.ColorUIResource [UI] +CheckBoxMenuItem.icon.disabledCheckmarkColor #ababab HSL 0 0 67 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI] CheckBoxMenuItem.opaque false CheckBoxMenuItem.selectionBackground #00aa00 HSL 120 100 33 javax.swing.plaf.ColorUIResource [UI] @@ -620,16 +622,6 @@ MenuItem.underlineSelectionBackground #e6e6e6 HSL 0 0 90 javax.swing.pl MenuItem.underlineSelectionCheckBackground #ccccff HSL 240 100 90 javax.swing.plaf.ColorUIResource [UI] MenuItem.underlineSelectionColor #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [UI] MenuItem.underlineSelectionHeight 3 - - -#---- MenuItemCheckBox ---- - -MenuItemCheckBox.icon.checkmarkColor #4d89c9 HSL 211 53 55 javax.swing.plaf.ColorUIResource [UI] -MenuItemCheckBox.icon.disabledCheckmarkColor #ababab HSL 0 0 67 javax.swing.plaf.ColorUIResource [UI] - - -#---- MenuItem ---- - MenuItemUI com.formdev.flatlaf.ui.FlatMenuItemUI diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties index e1e85ed8..d808a172 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties @@ -135,6 +135,12 @@ CheckBox.icon.hoverBackground = #ff0 CheckBox.icon.pressedBackground = #FFC800 +#---- CheckBoxMenuItem ---- + +CheckBoxMenuItem.icon.checkmarkColor = #4D89C9 +CheckBoxMenuItem.icon.disabledCheckmarkColor = #ABABAB + + #---- ComboBox ---- ComboBox.background = #fff @@ -231,12 +237,6 @@ MenuBar.underlineSelectionBackground = #0f0 MenuBar.underlineSelectionColor = #ff0 MenuBar.underlineSelectionHeight = 5 -#---- MenuItemCheckBox ---- - -MenuItemCheckBox.icon.checkmarkColor = #4D89C9 -MenuItemCheckBox.icon.disabledCheckmarkColor = #ABABAB - - #---- OptionPane ---- OptionPane.background = #fdd diff --git a/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt b/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt index de016433..fd4138ff 100644 --- a/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt +++ b/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt @@ -129,6 +129,8 @@ CheckBoxMenuItem.checkIcon CheckBoxMenuItem.disabledForeground CheckBoxMenuItem.font CheckBoxMenuItem.foreground +CheckBoxMenuItem.icon.checkmarkColor +CheckBoxMenuItem.icon.disabledCheckmarkColor CheckBoxMenuItem.margin CheckBoxMenuItem.opaque CheckBoxMenuItem.selectionBackground @@ -468,8 +470,6 @@ MenuItem.underlineSelectionBackground MenuItem.underlineSelectionCheckBackground MenuItem.underlineSelectionColor MenuItem.underlineSelectionHeight -MenuItemCheckBox.icon.checkmarkColor -MenuItemCheckBox.icon.disabledCheckmarkColor MenuItemUI MenuUI MonthViewUI