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

Button: undone most style changes done in previous commit related to focused and default buttons:

Browse Source 
- default button: white background and wide border
- focused button: light blue background and thin border

(the light blue default button did not look beautiful IMHO)
This commit is contained in:
Karl Tauber
2021-02-01 01:08:20 +01:00
parent 0bcdc14909
commit 7f8f3aa99b
8 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@@ -6,11 +6,8 @@ FlatLaf Change Log
#### New features and improvements
- Button:
- 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 Light" theme, use a slightly thinner border for focused buttons
(because they already have light blue 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.

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

@@ -84,6 +84,8 @@ Button.disabledBorderColor = $Button.borderColor
Button.focusedBorderColor = $Component.focusedBorderColor
Button.hoverBorderColor = $Button.focusedBorderColor
Button.innerFocusWidth = 1
Button.default.background = #365880
Button.default.foreground = #bbb
Button.default.hoverBackground = lighten($Button.default.background,3%,derived)

4
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatIntelliJLaf.properties
View File

@@ -33,10 +33,11 @@
#---- Button ----
Button.innerFocusWidth = 0
Button.focusedBackground = null
Button.default.background = #4D8AC9
Button.default.foreground = #fff
Button.default.focusedBackground = null
Button.default.borderColor = #3D75B2
Button.default.hoverBorderColor = #A9C9F5
Button.default.focusedBorderColor = #A9C9F5
@@ -48,7 +49,6 @@ Button.default.borderWidth = 1
#---- CheckBox ----
CheckBox.icon.style = filled
CheckBox.icon.focusedBackground = null
#---- Component ----

6
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
View File

@@ -164,7 +164,6 @@ Button.defaultButtonFollowsFocus = false
Button.borderWidth = 1
Button.default.borderWidth = 1
Button.innerFocusWidth = 1
Button.toolbar.margin = 3,3,3,3
Button.toolbar.spacingInsets = 1,2,1,2
@@ -285,13 +284,14 @@ HelpButton.focusedBorderColor = $CheckBox.icon.focusedBorderColor
HelpButton.hoverBorderColor = $?CheckBox.icon.hoverBorderColor
HelpButton.background = $CheckBox.icon.background
HelpButton.disabledBackground = $CheckBox.icon.disabledBackground
HelpButton.focusedBackground = $?Button.focusedBackground
HelpButton.hoverBackground = $?CheckBox.icon.hoverBackground
HelpButton.pressedBackground = $?CheckBox.icon.pressedBackground
HelpButton.questionMarkColor = $CheckBox.icon.checkmarkColor
HelpButton.disabledQuestionMarkColor = $CheckBox.icon.disabledCheckmarkColor
HelpButton.borderWidth = $Button.borderWidth
HelpButton.innerFocusWidth = $Button.innerFocusWidth
HelpButton.borderWidth = $?Button.borderWidth
HelpButton.innerFocusWidth = $?Button.innerFocusWidth
#---- InternalFrame ----

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

@@ -73,6 +73,7 @@ controlDkShadow = darken($controlShadow,15%)
#---- Button ----
Button.background = #fff
Button.focusedBackground = #e3f1fa
Button.hoverBackground = darken($Button.background,3%,derived)
Button.pressedBackground = darken($Button.background,10%,derived)
Button.selectedBackground = darken($Button.background,20%,derived)
@@ -84,14 +85,18 @@ Button.disabledBorderColor = $Component.disabledBorderColor
Button.focusedBorderColor = $Component.focusedBorderColor
Button.hoverBorderColor = $Button.focusedBorderColor
Button.default.background = #e3f1fa
Button.innerFocusWidth = 0
Button.default.background = $Button.background
Button.default.foreground = @foreground
Button.default.focusedBackground = $Button.focusedBackground
Button.default.hoverBackground = darken($Button.default.background,3%,derived)
Button.default.pressedBackground = darken($Button.default.background,10%,derived)
Button.default.borderColor = #4F9EE3
Button.default.hoverBorderColor = $Button.hoverBorderColor
Button.default.focusedBorderColor = $Button.focusedBorderColor
Button.default.focusColor = $Component.focusColor
Button.default.borderWidth = 2
Button.toolbar.hoverBackground = darken($Button.background,12%,derived)
Button.toolbar.pressedBackground = darken($Button.background,15%,derived)
@@ -114,7 +119,7 @@ CheckBox.icon.disabledCheckmarkColor = #ABABAB
# focused
CheckBox.icon.focusedBorderColor = #7B9FC7
CheckBox.icon.focusedBackground = #e3f1fa
CheckBox.icon.focusedBackground = $Button.focusedBackground
# hover
CheckBox.icon.hoverBorderColor = $CheckBox.icon.focusedBorderColor

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 #e3f1fa javax.swing.plaf.ColorUIResource [UI]
- Button.default.background #ffffff javax.swing.plaf.ColorUIResource [UI]
+ Button.default.background #4d8ac9 javax.swing.plaf.ColorUIResource [UI]
+ Button.default.boldText true
@@ -18,23 +18,27 @@
- 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 #d6ebf8 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse)
- Button.default.hoverBackground #f7f7f7 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 #b8dbf2 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse)
- Button.default.pressedBackground #e6e6e6 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse)
+ Button.default.pressedBackground #3571ae com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse)
- Button.innerFocusWidth 1
+ Button.innerFocusWidth 0
- Button.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI]
- CheckBox.icon.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI]
@@ -60,12 +64,11 @@
- 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]

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

@@ -67,20 +67,22 @@ 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 #e3f1fa javax.swing.plaf.ColorUIResource [UI]
Button.default.background #ffffff javax.swing.plaf.ColorUIResource [UI]
Button.default.borderColor #4f9ee3 javax.swing.plaf.ColorUIResource [UI]
Button.default.borderWidth 1
Button.default.borderWidth 2
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 #d6ebf8 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse)
Button.default.hoverBackground #f7f7f7 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse)
Button.default.hoverBorderColor #87afda javax.swing.plaf.ColorUIResource [UI]
Button.default.pressedBackground #b8dbf2 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse)
Button.default.pressedBackground #e6e6e6 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]
@@ -88,7 +90,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.innerFocusWidth 0
Button.light #e3e3e3 javax.swing.plaf.ColorUIResource [UI]
Button.margin 2,14,2,14 javax.swing.plaf.InsetsUIResource [UI]
Button.minimumWidth 72
@@ -334,11 +336,12 @@ 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.innerFocusWidth 0
HelpButton.pressedBackground #e6e6e6 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse)
HelpButton.questionMarkColor #4f9ee3 javax.swing.plaf.ColorUIResource [UI]

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

@@ -76,6 +76,8 @@ Button.disabledBorderColor = #008
Button.focusedBorderColor = #466d94
Button.hoverBorderColor = #f00
Button.innerFocusWidth = 1
Button.default.startBackground = #ddd
Button.default.endBackground = #888
Button.default.foreground = #800