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

Merge PR #378: TextField: leading and trailing icons

Browse Source 
# Conflicts:
#	flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPasswordFieldUI.java
#	flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java
This commit is contained in:
Karl Tauber
2021-09-15 23:32:57 +02:00
parent 263e6c34b5 a2c0df5891
commit fd15b63044
21 changed files with 577 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,6 +311,7 @@ FormattedTextField.caretForeground #bbbbbb HSL 0 0 73 javax.swing.plaf.
FormattedTextField.disabledBackground #3c3f41 HSL 204 4 25 javax.swing.plaf.ColorUIResource [UI]
FormattedTextField.font [active] $defaultFont [UI]
FormattedTextField.foreground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI]
FormattedTextField.iconTextGap 4
FormattedTextField.inactiveBackground #3c3f41 HSL 204 4 25 javax.swing.plaf.ColorUIResource [UI]
FormattedTextField.inactiveForeground #888888 HSL 0 0 53 javax.swing.plaf.ColorUIResource [UI]
FormattedTextField.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI]
@@ -699,6 +700,7 @@ PasswordField.disabledBackground #3c3f41 HSL 204 4 25 javax.swing.plaf.Co
PasswordField.echoChar '\u2022'
PasswordField.font [active] $defaultFont [UI]
PasswordField.foreground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI]
PasswordField.iconTextGap 4
PasswordField.inactiveBackground #3c3f41 HSL 204 4 25 javax.swing.plaf.ColorUIResource [UI]
PasswordField.inactiveForeground #888888 HSL 0 0 53 javax.swing.plaf.ColorUIResource [UI]
PasswordField.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI]
@@ -1157,6 +1159,7 @@ TextField.disabledBackground #3c3f41 HSL 204 4 25 javax.swing.plaf.Colo
TextField.font [active] $defaultFont [UI]
TextField.foreground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI]
TextField.highlight #242424 HSL 0 0 14 javax.swing.plaf.ColorUIResource [UI]
TextField.iconTextGap 4
TextField.inactiveBackground #3c3f41 HSL 204 4 25 javax.swing.plaf.ColorUIResource [UI]
TextField.inactiveForeground #888888 HSL 0 0 53 javax.swing.plaf.ColorUIResource [UI]
TextField.light #313131 HSL 0 0 19 javax.swing.plaf.ColorUIResource [UI]

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

@@ -315,6 +315,7 @@ FormattedTextField.caretForeground #000000 HSL 0 0 0 javax.swing.plaf.
FormattedTextField.disabledBackground #f2f2f2 HSL 0 0 95 javax.swing.plaf.ColorUIResource [UI]
FormattedTextField.font [active] $defaultFont [UI]
FormattedTextField.foreground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI]
FormattedTextField.iconTextGap 4
FormattedTextField.inactiveBackground #f2f2f2 HSL 0 0 95 javax.swing.plaf.ColorUIResource [UI]
FormattedTextField.inactiveForeground #8c8c8c HSL 0 0 55 javax.swing.plaf.ColorUIResource [UI]
FormattedTextField.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI]
@@ -704,6 +705,7 @@ PasswordField.disabledBackground #f2f2f2 HSL 0 0 95 javax.swing.plaf.Co
PasswordField.echoChar '\u2022'
PasswordField.font [active] $defaultFont [UI]
PasswordField.foreground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI]
PasswordField.iconTextGap 4
PasswordField.inactiveBackground #f2f2f2 HSL 0 0 95 javax.swing.plaf.ColorUIResource [UI]
PasswordField.inactiveForeground #8c8c8c HSL 0 0 55 javax.swing.plaf.ColorUIResource [UI]
PasswordField.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI]
@@ -1162,6 +1164,7 @@ TextField.disabledBackground #f2f2f2 HSL 0 0 95 javax.swing.plaf.Colo
TextField.font [active] $defaultFont [UI]
TextField.foreground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI]
TextField.highlight #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]
TextField.iconTextGap 4
TextField.inactiveBackground #f2f2f2 HSL 0 0 95 javax.swing.plaf.ColorUIResource [UI]
TextField.inactiveForeground #8c8c8c HSL 0 0 55 javax.swing.plaf.ColorUIResource [UI]
TextField.light #e3e3e3 HSL 0 0 89 javax.swing.plaf.ColorUIResource [UI]

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

@@ -311,6 +311,7 @@ FormattedTextField.disabledBackground #e0e0e0 HSL 0 0 88 javax.swing.pl
FormattedTextField.focusedBackground #ffff88 HSL 60 100 77 javax.swing.plaf.ColorUIResource [UI]
FormattedTextField.font [active] $defaultFont [UI]
FormattedTextField.foreground #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [UI]
FormattedTextField.iconTextGap 4
FormattedTextField.inactiveBackground #f0f0f0 HSL 0 0 94 javax.swing.plaf.ColorUIResource [UI]
FormattedTextField.inactiveForeground #000088 HSL 240 100 27 javax.swing.plaf.ColorUIResource [UI]
FormattedTextField.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI]
@@ -708,6 +709,7 @@ PasswordField.echoChar '\u2022'
PasswordField.focusedBackground #ffff88 HSL 60 100 77 javax.swing.plaf.ColorUIResource [UI]
PasswordField.font [active] $defaultFont [UI]
PasswordField.foreground #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [UI]
PasswordField.iconTextGap 4
PasswordField.inactiveBackground #f0f0f0 HSL 0 0 94 javax.swing.plaf.ColorUIResource [UI]
PasswordField.inactiveForeground #000088 HSL 240 100 27 javax.swing.plaf.ColorUIResource [UI]
PasswordField.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI]
@@ -1169,6 +1171,7 @@ TextField.focusedBackground #ffff88 HSL 60 100 77 javax.swing.plaf.Colo
TextField.font [active] $defaultFont [UI]
TextField.foreground #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [UI]
TextField.highlight #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]
TextField.iconTextGap 4
TextField.inactiveBackground #f0f0f0 HSL 0 0 94 javax.swing.plaf.ColorUIResource [UI]
TextField.inactiveForeground #000088 HSL 240 100 27 javax.swing.plaf.ColorUIResource [UI]
TextField.light #e3e3e3 HSL 0 0 89 javax.swing.plaf.ColorUIResource [UI]