angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-12 15:07:11 -06:00
Code Issues 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}.
*
* @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() {

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)
#---- 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

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)
#---- 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

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
#---- 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)