From c659638fb4d23c8ac254e634216e5f521649bf24 Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Wed, 15 Sep 2021 23:43:41 +0200
Subject: [PATCH] Styling: support styling for recently merged PR #378

---
 .../main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java   | 6 +++---
 .../java/com/formdev/flatlaf/ui/TestFlatStyleableInfo.java  | 5 ++++-
 .../test/java/com/formdev/flatlaf/ui/TestFlatStyling.java   | 3 +++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java
index 4a910142..137d4160 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java
@@ -89,10 +89,10 @@ public class FlatTextFieldUI
 	@Styleable protected Color inactiveBackground;
 	@Styleable protected Color placeholderForeground;
 	@Styleable protected Color focusedBackground;
-	/** @since 2 */ protected int iconTextGap;
+	/** @since 2 */ @Styleable protected int iconTextGap;
 
-	/** @since 2 */ protected Icon leadingIcon;
-	/** @since 2 */ protected Icon trailingIcon;
+	/** @since 2 */ @Styleable protected Icon leadingIcon;
+	/** @since 2 */ @Styleable protected Icon trailingIcon;
 
 	private Color oldDisabledBackground;
 	private Color oldInactiveBackground;
diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyleableInfo.java b/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyleableInfo.java
index 24a0545a..a37e7914 100644
--- a/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyleableInfo.java
+++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyleableInfo.java
@@ -778,7 +778,10 @@ public class TestFlatStyleableInfo
 			"disabledBackground", Color.class,
 			"inactiveBackground", Color.class,
 			"placeholderForeground", Color.class,
-			"focusedBackground", Color.class
+			"focusedBackground", Color.class,
+			"iconTextGap", int.class,
+			"leadingIcon", Icon.class,
+			"trailingIcon", Icon.class
 		);
 
 		// border
diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyling.java b/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyling.java
index 8f458c99..b02dfa35 100644
--- a/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyling.java
+++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyling.java
@@ -890,6 +890,9 @@ public class TestFlatStyling
 		ui.applyStyle( "inactiveBackground: #fff" );
 		ui.applyStyle( "placeholderForeground: #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
 		flatTextBorder( style -> ui.applyStyle( style ) );