Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-07 14:30:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Theming improvements:

Browse Source 
- renamed `MenuItemCheckBox.icon.checkmarkColor` to `CheckBoxMenuItem.icon.checkmarkColor`
- renamed `MenuItemCheckBox.icon.disabledCheckmarkColor` to `CheckBoxMenuItem.icon.disabledCheckmarkColor`

(Note: this are incompatible changes!)
This commit is contained in:
Karl Tauber
2021-10-03 23:28:53 +02:00
parent f0c314df80
commit 2e1ef647a9
9 changed files with 37 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxMenuItemIcon.java
View File

@@ -31,8 +31,8 @@ import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable;
/** /**
* Icon for {@link javax.swing.JCheckBoxMenuItem}. * Icon for {@link javax.swing.JCheckBoxMenuItem}.
* *
* @uiDefault MenuItemCheckBox.icon.checkmarkColor Color * @uiDefault CheckBoxMenuItem.icon.checkmarkColor Color
* @uiDefault MenuItemCheckBox.icon.disabledCheckmarkColor Color * @uiDefault CheckBoxMenuItem.icon.disabledCheckmarkColor Color
* @uiDefault MenuItem.selectionForeground Color * @uiDefault MenuItem.selectionForeground Color
* @uiDefault MenuItem.selectionType String * @uiDefault MenuItem.selectionType String
* *
@@ -41,8 +41,8 @@ import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable;
public class FlatCheckBoxMenuItemIcon public class FlatCheckBoxMenuItemIcon
extends FlatAbstractIcon extends FlatAbstractIcon
{ {
@Styleable protected Color checkmarkColor = UIManager.getColor( "MenuItemCheckBox.icon.checkmarkColor" ); @Styleable protected Color checkmarkColor = UIManager.getColor( "CheckBoxMenuItem.icon.checkmarkColor" );
@Styleable protected Color disabledCheckmarkColor = UIManager.getColor( "MenuItemCheckBox.icon.disabledCheckmarkColor" ); @Styleable protected Color disabledCheckmarkColor = UIManager.getColor( "CheckBoxMenuItem.icon.disabledCheckmarkColor" );
@Styleable protected Color selectionForeground = UIManager.getColor( "MenuItem.selectionForeground" ); @Styleable protected Color selectionForeground = UIManager.getColor( "MenuItem.selectionForeground" );
public FlatCheckBoxMenuItemIcon() { public FlatCheckBoxMenuItemIcon() {

12
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
View File

@@ -163,6 +163,12 @@ CheckBox.icon[filled].selectedHoverBackground = darken($CheckBox.icon[filled].se
CheckBox.icon[filled].selectedPressedBackground = darken($CheckBox.icon[filled].selectedBackground,6%,derived) CheckBox.icon[filled].selectedPressedBackground = darken($CheckBox.icon[filled].selectedBackground,6%,derived)
#---- CheckBoxMenuItem ----
CheckBoxMenuItem.icon.checkmarkColor = @buttonArrowColor
CheckBoxMenuItem.icon.disabledCheckmarkColor = @buttonDisabledArrowColor
#---- Component ---- #---- Component ----
Component.borderColor = tint(@background,19%) Component.borderColor = tint(@background,19%)
@@ -228,12 +234,6 @@ Menu.icon.disabledArrowColor = @buttonDisabledArrowColor
MenuBar.borderColor = $Separator.foreground MenuBar.borderColor = $Separator.foreground
#---- MenuItemCheckBox ----
MenuItemCheckBox.icon.checkmarkColor = @buttonArrowColor
MenuItemCheckBox.icon.disabledCheckmarkColor = @buttonDisabledArrowColor
#---- PasswordField ---- #---- PasswordField ----
PasswordField.capsLockIconColor = #ffffff64 PasswordField.capsLockIconColor = #ffffff64

12
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties
View File

@@ -170,6 +170,12 @@ CheckBox.icon[filled].selectedHoverBackground = darken($CheckBox.icon[filled].se
CheckBox.icon[filled].selectedPressedBackground = darken($CheckBox.icon[filled].selectedBackground,10%,derived) CheckBox.icon[filled].selectedPressedBackground = darken($CheckBox.icon[filled].selectedBackground,10%,derived)
#---- CheckBoxMenuItem ----
CheckBoxMenuItem.icon.checkmarkColor = @accentCheckmarkColor
CheckBoxMenuItem.icon.disabledCheckmarkColor = @buttonDisabledArrowColor
#---- Component ---- #---- Component ----
Component.borderColor = shade(@background,20%) Component.borderColor = shade(@background,20%)
@@ -235,12 +241,6 @@ Menu.icon.disabledArrowColor = @buttonDisabledArrowColor
MenuBar.borderColor = $Separator.foreground MenuBar.borderColor = $Separator.foreground
#---- MenuItemCheckBox ----
MenuItemCheckBox.icon.checkmarkColor = @accentCheckmarkColor
MenuItemCheckBox.icon.disabledCheckmarkColor = @buttonDisabledArrowColor
#---- PasswordField ---- #---- PasswordField ----
PasswordField.capsLockIconColor = #00000064 PasswordField.capsLockIconColor = #00000064

14
flatlaf-core/src/main/resources/com/formdev/flatlaf/IntelliJTheme$ThemeLaf.properties
View File

@@ -60,18 +60,18 @@ Button.hoverBorderColor = null
Button.default.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 ----
HelpButton.hoverBorderColor = null 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 ----
Slider.focusedColor = fade($Component.focusColor,40%,derived) Slider.focusedColor = fade($Component.focusColor,40%,derived)

12
flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt
View File

@@ -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.disabledForeground #8c8c8c HSL 0 0 55 javax.swing.plaf.ColorUIResource [UI]
CheckBoxMenuItem.font [active] $defaultFont [UI] CheckBoxMenuItem.font [active] $defaultFont [UI]
CheckBoxMenuItem.foreground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [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.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI]
CheckBoxMenuItem.opaque false CheckBoxMenuItem.opaque false
CheckBoxMenuItem.selectionBackground #4b6eaf HSL 219 40 49 javax.swing.plaf.ColorUIResource [UI] 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.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.underlineSelectionColor #4c87c8 HSL 211 53 54 javax.swing.plaf.ColorUIResource [UI]
MenuItem.underlineSelectionHeight 3 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 MenuItemUI com.formdev.flatlaf.ui.FlatMenuItemUI

12
flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt
View File

@@ -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.disabledForeground #8c8c8c HSL 0 0 55 javax.swing.plaf.ColorUIResource [UI]
CheckBoxMenuItem.font [active] $defaultFont [UI] CheckBoxMenuItem.font [active] $defaultFont [UI]
CheckBoxMenuItem.foreground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [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.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI]
CheckBoxMenuItem.opaque false CheckBoxMenuItem.opaque false
CheckBoxMenuItem.selectionBackground #2675bf HSL 209 67 45 javax.swing.plaf.ColorUIResource [UI] 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.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.underlineSelectionColor #3c83c5 HSL 209 54 50 javax.swing.plaf.ColorUIResource [UI]
MenuItem.underlineSelectionHeight 3 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 MenuItemUI com.formdev.flatlaf.ui.FlatMenuItemUI

12
flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt
View File

@@ -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.disabledForeground #000088 HSL 240 100 27 javax.swing.plaf.ColorUIResource [UI]
CheckBoxMenuItem.font [active] $defaultFont [UI] CheckBoxMenuItem.font [active] $defaultFont [UI]
CheckBoxMenuItem.foreground #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [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.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI]
CheckBoxMenuItem.opaque false CheckBoxMenuItem.opaque false
CheckBoxMenuItem.selectionBackground #00aa00 HSL 120 100 33 javax.swing.plaf.ColorUIResource [UI] 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.underlineSelectionCheckBackground #ccccff HSL 240 100 90 javax.swing.plaf.ColorUIResource [UI]
MenuItem.underlineSelectionColor #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [UI] MenuItem.underlineSelectionColor #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [UI]
MenuItem.underlineSelectionHeight 3 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 MenuItemUI com.formdev.flatlaf.ui.FlatMenuItemUI

12
flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties
View File

@@ -135,6 +135,12 @@ CheckBox.icon.hoverBackground = #ff0
CheckBox.icon.pressedBackground = #FFC800 CheckBox.icon.pressedBackground = #FFC800
#---- CheckBoxMenuItem ----
CheckBoxMenuItem.icon.checkmarkColor = #4D89C9
CheckBoxMenuItem.icon.disabledCheckmarkColor = #ABABAB
#---- ComboBox ---- #---- ComboBox ----
ComboBox.background = #fff ComboBox.background = #fff
@@ -231,12 +237,6 @@ MenuBar.underlineSelectionBackground = #0f0
MenuBar.underlineSelectionColor = #ff0 MenuBar.underlineSelectionColor = #ff0
MenuBar.underlineSelectionHeight = 5 MenuBar.underlineSelectionHeight = 5
#---- MenuItemCheckBox ----
MenuItemCheckBox.icon.checkmarkColor = #4D89C9
MenuItemCheckBox.icon.disabledCheckmarkColor = #ABABAB
#---- OptionPane ---- #---- OptionPane ----
OptionPane.background = #fdd OptionPane.background = #fdd

4
flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt
View File

@@ -129,6 +129,8 @@ CheckBoxMenuItem.checkIcon
CheckBoxMenuItem.disabledForeground CheckBoxMenuItem.disabledForeground
CheckBoxMenuItem.font CheckBoxMenuItem.font
CheckBoxMenuItem.foreground CheckBoxMenuItem.foreground
CheckBoxMenuItem.icon.checkmarkColor
CheckBoxMenuItem.icon.disabledCheckmarkColor
CheckBoxMenuItem.margin CheckBoxMenuItem.margin
CheckBoxMenuItem.opaque CheckBoxMenuItem.opaque
CheckBoxMenuItem.selectionBackground CheckBoxMenuItem.selectionBackground
@@ -468,8 +470,6 @@ MenuItem.underlineSelectionBackground
MenuItem.underlineSelectionCheckBackground MenuItem.underlineSelectionCheckBackground
MenuItem.underlineSelectionColor MenuItem.underlineSelectionColor
MenuItem.underlineSelectionHeight MenuItem.underlineSelectionHeight
MenuItemCheckBox.icon.checkmarkColor
MenuItemCheckBox.icon.disabledCheckmarkColor
MenuItemUI MenuItemUI
MenuUI MenuUI
MonthViewUI MonthViewUI