CheckBox and RadioButton: support changing selected icon style from outline to filled

renamed CheckBox.icon.focusedColor to CheckBox.icon.focusColor
This commit is contained in:
Karl Tauber
2020-06-19 15:36:49 +02:00
parent 1ba27730d6
commit 84cc86bef7
10 changed files with 121 additions and 63 deletions

View File

@@ -130,6 +130,11 @@ CheckBox.icon.selectedBorderColor #6b6b6b javax.swing.plaf.ColorUIResource [U
CheckBox.icon.selectedFocusedBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon [lazy] 15,15 com.formdev.flatlaf.icons.FlatCheckBoxIcon [UI]
CheckBox.iconTextGap 4
CheckBox.icon[filled].checkmarkColor #43494a javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon[filled].selectedBackground #a7a7a7 javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon[filled].selectedBorderColor #a7a7a7 javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon[filled].selectedHoverBackground #9f9f9f javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon[filled].selectedPressedBackground #989898 javax.swing.plaf.ColorUIResource [UI]
CheckBox.margin 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI]
CheckBox.rollover true
CheckBox.textIconGap 4
@@ -704,6 +709,7 @@ RadioButton.highlight #242424 javax.swing.plaf.ColorUIResource [UI]
RadioButton.icon.centerDiameter 8
RadioButton.icon [lazy] 15,15 com.formdev.flatlaf.icons.FlatRadioButtonIcon [UI]
RadioButton.iconTextGap 4
RadioButton.icon[filled].centerDiameter 5
RadioButton.light #313131 javax.swing.plaf.ColorUIResource [UI]
RadioButton.margin 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI]
RadioButton.rollover true

View File

@@ -34,22 +34,13 @@
- Button.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI]
- CheckBox.icon.checkmarkColor #4f9ee3 javax.swing.plaf.ColorUIResource [UI]
+ CheckBox.icon.checkmarkColor #ffffff javax.swing.plaf.ColorUIResource [UI]
- CheckBox.icon.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI]
- CheckBox.icon.selectedBackground #ffffff javax.swing.plaf.ColorUIResource [UI]
+ CheckBox.icon.selectedBackground #4f9ee3 javax.swing.plaf.ColorUIResource [UI]
+ CheckBox.icon.style filled
- CheckBox.icon.selectedBorderColor #b0b0b0 javax.swing.plaf.ColorUIResource [UI]
+ CheckBox.icon.selectedBorderColor #4b97d9 javax.swing.plaf.ColorUIResource [UI]
+ CheckBox.icon[filled].focusWidth 2
+ CheckBox.icon.selectedFocusedBorderColor #accff7 javax.swing.plaf.ColorUIResource [UI]
+ CheckBox.icon.selectedHoverBackground #5e94ce javax.swing.plaf.ColorUIResource [UI]
+ CheckBox.icon.selectedPressedBackground #72a1d4 javax.swing.plaf.ColorUIResource [UI]
- CheckBox.icon[filled].selectedFocusedCheckmarkColor #e3f1fa javax.swing.plaf.ColorUIResource [UI]
- ComboBox.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatRoundBorder [UI]
+ ComboBox.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatRoundBorder [UI]
@@ -80,9 +71,6 @@
- PasswordField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI]
+ PasswordField.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatTextBorder [UI]
- RadioButton.icon.centerDiameter 8
+ RadioButton.icon.centerDiameter 5
- ScrollPane.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI]
+ ScrollPane.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatBorder [UI]

View File

@@ -131,6 +131,14 @@ CheckBox.icon.selectedBackground #ffffff javax.swing.plaf.ColorUIResource [UI
CheckBox.icon.selectedBorderColor #b0b0b0 javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon [lazy] 15,15 com.formdev.flatlaf.icons.FlatCheckBoxIcon [UI]
CheckBox.iconTextGap 4
CheckBox.icon[filled].checkmarkColor #ffffff javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon[filled].selectedBackground #4f9ee3 javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon[filled].selectedBorderColor #4b97d9 javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon[filled].selectedFocusedBackground #4f9ee3 javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon[filled].selectedFocusedBorderColor #accff7 javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon[filled].selectedFocusedCheckmarkColor #e3f1fa javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon[filled].selectedHoverBackground #5e94ce javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon[filled].selectedPressedBackground #72a1d4 javax.swing.plaf.ColorUIResource [UI]
CheckBox.margin 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI]
CheckBox.rollover true
CheckBox.textIconGap 4
@@ -706,6 +714,7 @@ RadioButton.highlight #ffffff javax.swing.plaf.ColorUIResource [UI]
RadioButton.icon.centerDiameter 8
RadioButton.icon [lazy] 15,15 com.formdev.flatlaf.icons.FlatRadioButtonIcon [UI]
RadioButton.iconTextGap 4
RadioButton.icon[filled].centerDiameter 5
RadioButton.light #e3e3e3 javax.swing.plaf.ColorUIResource [UI]
RadioButton.margin 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI]
RadioButton.rollover true