angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-12 23:07:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

- Button:

Browse Source 
- In "Flat Light" theme, changed styles of focused and default buttons to
    avoid confusion with all other themes. Focused buttons now have a white
    background (was light blue) and a slightly wider border. The default button
    now has a light blue background (was white) and a thin border. In all other
    themes the default button also has colored background.
  - In "Flat Dark" theme, use slightly wider border for focused buttons.
- CheckBox and RadioButton: In "Flat Dark" theme, use blueish background for
  focused components.
This commit is contained in:
Karl Tauber
2021-01-31 20:02:24 +01:00
parent 526c25a02b
commit 0bcdc14909
17 changed files with 108 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0_202.txt
View File

@@ -10,6 +10,11 @@
- Button.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatButtonBorder [UI]
+ Button.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatButtonBorder [UI]
- Button.innerFocusWidth 1
+ Button.innerFocusWidth 0
- CheckBox.icon.focusedBackground #4d466d94 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]
@@ -31,6 +36,9 @@
- HelpButton.icon [lazy] 22,22 com.formdev.flatlaf.icons.FlatHelpButtonIcon [UI]
+ HelpButton.icon [lazy] 26,26 com.formdev.flatlaf.icons.FlatHelpButtonIcon [UI]
- HelpButton.innerFocusWidth 1
+ HelpButton.innerFocusWidth 0
- JXDatePicker.border [lazy] 1,1,1,1 false com.formdev.flatlaf.swingx.ui.FlatDatePickerBorder [UI]
+ JXDatePicker.border [lazy] 3,3,3,3 false com.formdev.flatlaf.swingx.ui.FlatDatePickerBorder [UI]

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

@@ -89,6 +89,7 @@ Button.highlight #242424 javax.swing.plaf.ColorUIResource [UI]
Button.hoverBackground #53585a com.formdev.flatlaf.util.DerivedColor [UI] lighten(3% autoInverse)
Button.hoverBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI]
Button.iconTextGap 4
Button.innerFocusWidth 1
Button.light #313131 javax.swing.plaf.ColorUIResource [UI]
Button.margin 2,14,2,14 javax.swing.plaf.InsetsUIResource [UI]
Button.minimumWidth 72
@@ -126,6 +127,7 @@ CheckBox.icon.checkmarkColor #a7a7a7 javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon.disabledBorderColor #545556 javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon.disabledCheckmarkColor #606060 javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon.focusedBackground #4d466d94 javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon.focusedBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon.hoverBackground #4a5152 com.formdev.flatlaf.util.DerivedColor [UI] lighten(3% autoInverse)
CheckBox.icon.hoverBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI]
@@ -326,6 +328,7 @@ HeaderUI com.formdev.flatlaf.swingx.ui.FlatHeaderUI
HelpButton.background #43494a javax.swing.plaf.ColorUIResource [UI]
HelpButton.borderColor #6b6b6b javax.swing.plaf.ColorUIResource [UI]
HelpButton.borderWidth 1
HelpButton.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI]
HelpButton.disabledBorderColor #545556 javax.swing.plaf.ColorUIResource [UI]
HelpButton.disabledQuestionMarkColor #606060 javax.swing.plaf.ColorUIResource [UI]
@@ -333,6 +336,7 @@ HelpButton.focusedBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI]
HelpButton.hoverBackground #4a5152 com.formdev.flatlaf.util.DerivedColor [UI] lighten(3% autoInverse)
HelpButton.hoverBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI]
HelpButton.icon [lazy] 22,22 com.formdev.flatlaf.icons.FlatHelpButtonIcon [UI]
HelpButton.innerFocusWidth 1
HelpButton.pressedBackground #52595a com.formdev.flatlaf.util.DerivedColor [UI] lighten(6% autoInverse)
HelpButton.questionMarkColor #a7a7a7 javax.swing.plaf.ColorUIResource [UI]

19
flatlaf-testing/dumps/uidefaults/FlatIntelliJLaf_1.8.0_202.txt
View File

@@ -10,7 +10,7 @@
- Button.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatButtonBorder [UI]
+ Button.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatButtonBorder [UI]
- Button.default.background #ffffff javax.swing.plaf.ColorUIResource [UI]
- Button.default.background #e3f1fa javax.swing.plaf.ColorUIResource [UI]
+ Button.default.background #4d8ac9 javax.swing.plaf.ColorUIResource [UI]
+ Button.default.boldText true
@@ -18,27 +18,23 @@
- Button.default.borderColor #4f9ee3 javax.swing.plaf.ColorUIResource [UI]
+ Button.default.borderColor #3d75b2 javax.swing.plaf.ColorUIResource [UI]
- Button.default.borderWidth 2
+ Button.default.borderWidth 1
- Button.default.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI]
- Button.default.focusedBorderColor #87afda javax.swing.plaf.ColorUIResource [UI]
+ Button.default.focusedBorderColor #a9c9f5 javax.swing.plaf.ColorUIResource [UI]
- Button.default.foreground #000000 javax.swing.plaf.ColorUIResource [UI]
+ Button.default.foreground #ffffff javax.swing.plaf.ColorUIResource [UI]
- Button.default.hoverBackground #f7f7f7 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse)
- Button.default.hoverBackground #d6ebf8 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse)
+ Button.default.hoverBackground #4182c5 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse)
- Button.default.hoverBorderColor #87afda javax.swing.plaf.ColorUIResource [UI]
+ Button.default.hoverBorderColor #a9c9f5 javax.swing.plaf.ColorUIResource [UI]
- Button.default.pressedBackground #e6e6e6 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse)
- Button.default.pressedBackground #b8dbf2 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse)
+ Button.default.pressedBackground #3571ae com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse)
- Button.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI]
- Button.innerFocusWidth 1
+ Button.innerFocusWidth 0
- CheckBox.icon.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI]
@@ -64,11 +60,12 @@
- FormattedTextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI]
+ FormattedTextField.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatTextBorder [UI]
- HelpButton.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI]
- HelpButton.icon [lazy] 22,22 com.formdev.flatlaf.icons.FlatHelpButtonIcon [UI]
+ HelpButton.icon [lazy] 26,26 com.formdev.flatlaf.icons.FlatHelpButtonIcon [UI]
- HelpButton.innerFocusWidth 1
+ HelpButton.innerFocusWidth 0
- JXDatePicker.border [lazy] 1,1,1,1 false com.formdev.flatlaf.swingx.ui.FlatDatePickerBorder [UI]
+ JXDatePicker.border [lazy] 3,3,3,3 false com.formdev.flatlaf.swingx.ui.FlatDatePickerBorder [UI]

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

@@ -67,22 +67,20 @@ Button.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.F
Button.borderColor #c4c4c4 javax.swing.plaf.ColorUIResource [UI]
Button.borderWidth 1
Button.darkShadow #9e9e9e javax.swing.plaf.ColorUIResource [UI]
Button.default.background #ffffff javax.swing.plaf.ColorUIResource [UI]
Button.default.background #e3f1fa javax.swing.plaf.ColorUIResource [UI]
Button.default.borderColor #4f9ee3 javax.swing.plaf.ColorUIResource [UI]
Button.default.borderWidth 2
Button.default.borderWidth 1
Button.default.focusColor #97c3f3 javax.swing.plaf.ColorUIResource [UI]
Button.default.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI]
Button.default.focusedBorderColor #87afda javax.swing.plaf.ColorUIResource [UI]
Button.default.foreground #000000 javax.swing.plaf.ColorUIResource [UI]
Button.default.hoverBackground #f7f7f7 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse)
Button.default.hoverBackground #d6ebf8 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse)
Button.default.hoverBorderColor #87afda javax.swing.plaf.ColorUIResource [UI]
Button.default.pressedBackground #e6e6e6 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse)
Button.default.pressedBackground #b8dbf2 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse)
Button.defaultButtonFollowsFocus false
Button.disabledBackground #f2f2f2 javax.swing.plaf.ColorUIResource [UI]
Button.disabledBorderColor #cfcfcf javax.swing.plaf.ColorUIResource [UI]
Button.disabledSelectedBackground #dedede com.formdev.flatlaf.util.DerivedColor [UI] darken(13% autoInverse)
Button.disabledText #8c8c8c javax.swing.plaf.ColorUIResource [UI]
Button.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI]
Button.focusedBorderColor #87afda javax.swing.plaf.ColorUIResource [UI]
Button.font [active] $defaultFont [UI]
Button.foreground #000000 javax.swing.plaf.ColorUIResource [UI]
@@ -90,6 +88,7 @@ Button.highlight #ffffff javax.swing.plaf.ColorUIResource [UI]
Button.hoverBackground #f7f7f7 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse)
Button.hoverBorderColor #87afda javax.swing.plaf.ColorUIResource [UI]
Button.iconTextGap 4
Button.innerFocusWidth 1
Button.light #e3e3e3 javax.swing.plaf.ColorUIResource [UI]
Button.margin 2,14,2,14 javax.swing.plaf.InsetsUIResource [UI]
Button.minimumWidth 72
@@ -331,14 +330,15 @@ HeaderUI com.formdev.flatlaf.swingx.ui.FlatHeaderUI
HelpButton.background #ffffff javax.swing.plaf.ColorUIResource [UI]
HelpButton.borderColor #b0b0b0 javax.swing.plaf.ColorUIResource [UI]
HelpButton.borderWidth 1
HelpButton.disabledBackground #f2f2f2 javax.swing.plaf.ColorUIResource [UI]
HelpButton.disabledBorderColor #bdbdbd javax.swing.plaf.ColorUIResource [UI]
HelpButton.disabledQuestionMarkColor #ababab javax.swing.plaf.ColorUIResource [UI]
HelpButton.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI]
HelpButton.focusedBorderColor #7b9fc7 javax.swing.plaf.ColorUIResource [UI]
HelpButton.hoverBackground #f7f7f7 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse)
HelpButton.hoverBorderColor #7b9fc7 javax.swing.plaf.ColorUIResource [UI]
HelpButton.icon [lazy] 22,22 com.formdev.flatlaf.icons.FlatHelpButtonIcon [UI]
HelpButton.innerFocusWidth 1
HelpButton.pressedBackground #e6e6e6 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse)
HelpButton.questionMarkColor #4f9ee3 javax.swing.plaf.ColorUIResource [UI]

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

@@ -92,6 +92,7 @@ Button.highlight #ffffff javax.swing.plaf.ColorUIResource [UI]
Button.hoverBackground #ffff00 javax.swing.plaf.ColorUIResource [UI]
Button.hoverBorderColor #ff0000 javax.swing.plaf.ColorUIResource [UI]
Button.iconTextGap 4
Button.innerFocusWidth 1
Button.light #e3e3e3 javax.swing.plaf.ColorUIResource [UI]
Button.margin 2,14,2,14 javax.swing.plaf.InsetsUIResource [UI]
Button.minimumWidth 72
@@ -319,6 +320,7 @@ HeaderUI com.formdev.flatlaf.swingx.ui.FlatHeaderUI
HelpButton.background #ffffff javax.swing.plaf.ColorUIResource [UI]
HelpButton.borderColor #878787 javax.swing.plaf.ColorUIResource [UI]
HelpButton.borderWidth 1
HelpButton.disabledBackground #f2f2f2 javax.swing.plaf.ColorUIResource [UI]
HelpButton.disabledBorderColor #bdbdbd javax.swing.plaf.ColorUIResource [UI]
HelpButton.disabledQuestionMarkColor #ababab javax.swing.plaf.ColorUIResource [UI]
@@ -327,6 +329,7 @@ HelpButton.focusedBorderColor #7b9fc7 javax.swing.plaf.ColorUIResource [UI]
HelpButton.hoverBackground #ffff00 javax.swing.plaf.ColorUIResource [UI]
HelpButton.hoverBorderColor #ff0000 javax.swing.plaf.ColorUIResource [UI]
HelpButton.icon [lazy] 22,22 com.formdev.flatlaf.icons.FlatHelpButtonIcon [UI]
HelpButton.innerFocusWidth 1
HelpButton.pressedBackground #ffc800 javax.swing.plaf.ColorUIResource [UI]
HelpButton.questionMarkColor #0000ff javax.swing.plaf.ColorUIResource [UI]

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

@@ -149,6 +149,7 @@ DesktopIcon.background = darken($Desktop.background,20%)
#---- HelpButton ----
HelpButton.focusedBackground = #0ff
HelpButton.questionMarkColor = #00f