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

Styling: support styling for recently merged PR #378

Browse Source
This commit is contained in:
Karl Tauber
2021-09-15 23:43:41 +02:00
parent fd15b63044
commit c659638fb4
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java
View File

@@ -89,10 +89,10 @@ public class FlatTextFieldUI
@Styleable protected Color inactiveBackground; @Styleable protected Color inactiveBackground;
@Styleable protected Color placeholderForeground; @Styleable protected Color placeholderForeground;
@Styleable protected Color focusedBackground; @Styleable protected Color focusedBackground;
/** @since 2 */ protected int iconTextGap; /** @since 2 */ @Styleable protected int iconTextGap;
/** @since 2 */ protected Icon leadingIcon; /** @since 2 */ @Styleable protected Icon leadingIcon;
/** @since 2 */ protected Icon trailingIcon; /** @since 2 */ @Styleable protected Icon trailingIcon;
private Color oldDisabledBackground; private Color oldDisabledBackground;
private Color oldInactiveBackground; private Color oldInactiveBackground;

5
flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyleableInfo.java
View File

@@ -778,7 +778,10 @@ public class TestFlatStyleableInfo
"disabledBackground", Color.class, "disabledBackground", Color.class,
"inactiveBackground", Color.class, "inactiveBackground", Color.class,
"placeholderForeground", Color.class, "placeholderForeground", Color.class,
"focusedBackground", Color.class "focusedBackground", Color.class,
"iconTextGap", int.class,
"leadingIcon", Icon.class,
"trailingIcon", Icon.class
); );
// border // border

3
flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyling.java
View File

@@ -890,6 +890,9 @@ public class TestFlatStyling
ui.applyStyle( "inactiveBackground: #fff" ); ui.applyStyle( "inactiveBackground: #fff" );
ui.applyStyle( "placeholderForeground: #fff" ); ui.applyStyle( "placeholderForeground: #fff" );
ui.applyStyle( "focusedBackground: #fff" ); ui.applyStyle( "focusedBackground: #fff" );
ui.applyStyle( "iconTextGap: 4" );
ui.applyStyle( "leadingIcon: com.formdev.flatlaf.icons.FlatSearchIcon" );
ui.applyStyle( "trailingIcon: com.formdev.flatlaf.icons.FlatClearIcon" );
// border // border
flatTextBorder( style -> ui.applyStyle( style ) ); flatTextBorder( style -> ui.applyStyle( style ) );