TextField: some updates for PR #1110:

- removed class HorizontalInsets; use Insets instead
- also reduce width of minimum size
- added some comments
- renamed some variables for clarity

Author: DevCharly

CHANGELOG.md

@@ -7,7 +7,8 @@ FlatLaf Change Log
   - macOS: `Cmd+A` (**Select All**) did not work in file dialog. (issue #1084)
 - macOS: Fixed missing close/iconify/maximize buttons on inactive window, if
   system appearance is dark, but application appearance is light. (issue #1032)
-
+- TextComponents: Fixed preferred width when leading/trailing components or
+  icons are present. (issue #1110)
 
 ## 3.7.1
 

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

@@ -540,41 +540,44 @@ protected void paintIcons( Graphics g, Rectangle r ) {
 
 	@Override
 	public Dimension getPreferredSize( JComponent c ) {
-		return applyMinimumWidth( c, applyExtraSize( super.getPreferredSize( c ), true ), minimumWidth );
+		return applyMinimumWidth( c, applyExtraSize( super.getPreferredSize( c ) ), minimumWidth );
 	}
 
 	@Override
 	public Dimension getMinimumSize( JComponent c ) {
-		return applyMinimumWidth( c, applyExtraSize( super.getMinimumSize( c ), false ), minimumWidth );
+		return applyMinimumWidth( c, applyExtraSize( super.getMinimumSize( c ) ), minimumWidth );
 	}
 
-	private Dimension applyExtraSize( Dimension size, boolean reduceInset ) {
+	private Dimension applyExtraSize( Dimension size ) {
 		// add width of leading and trailing icons
 		size.width += getLeadingIconWidth() + getTrailingIconWidth();
 
 		// add width of leading and trailing components
-		boolean leftVisible = false;
-		boolean rightVisible = false;
+		boolean leftCompVisible = false;
+		boolean rightCompVisible = false;
 		for( JComponent comp : getLeadingComponents() ) {
 			if( comp != null && comp.isVisible() ) {
 				size.width += comp.getPreferredSize().width;
-				leftVisible = true;
+				leftCompVisible = true;
 			}
 		}
 		for( JComponent comp : getTrailingComponents() ) {
 			if( comp != null && comp.isVisible() ) {
 				size.width += comp.getPreferredSize().width;
-				rightVisible = true;
+				rightCompVisible = true;
 			}
 		}
-		if( reduceInset ) {
-			boolean ltr = isLeftToRight();
-			HorizontalInsets diffInsets = getDiffInsets( leftVisible, rightVisible, ltr );
-			if( diffInsets.left > 0 )
-				size.width -= diffInsets.left;
-			if( diffInsets.right > 0 )
-				size.width -= diffInsets.right;
-		}
+
+		// if leading/trailing icons or components are shown,
+		// then the left/right insets are reduced to the top inset,
+		// which places the icon nicely centered on left/right side
+		// --> reduce width if necessary
+		Insets diffInsets = getDiffInsets( leftCompVisible, rightCompVisible );
+		if( diffInsets.left > 0 )
+			size.width -= diffInsets.left;
+		if( diffInsets.right > 0 )
+			size.width -= diffInsets.right;
+
 		return size;
 	}
 
@@ -600,23 +603,6 @@ private Dimension applyMinimumWidth( JComponent c, Dimension size, int minimumWi
 		return size;
 	}
 
-	private HorizontalInsets getDiffInsets( boolean leftVisible, boolean rightVisible, boolean ltr ) {
-		int left = 0;
-		int right = 0;
-		Insets insets = getComponent().getInsets();
-		if( leftVisible || (ltr ? hasLeadingIcon() : hasTrailingIcon()) ) {
-			int newLeftInset = Math.min( insets.left, insets.top );
-			if( newLeftInset < insets.left )
-				left = insets.left - newLeftInset;
-		}
-		if( rightVisible || (ltr ? hasTrailingIcon() : hasLeadingIcon()) ) {
-			int newRightInset = Math.min( insets.right, insets.top );
-			if( newRightInset < insets.right )
-				right = insets.right - newRightInset;
-		}
-		return new HorizontalInsets( left, right );
-	}
-
 	static boolean hasDefaultMargins( JComponent c, Insets defaultMargin ) {
 		Insets margin = ((JTextComponent)c).getMargin();
 		return margin instanceof UIResource && Objects.equals( margin, defaultMargin );
@@ -673,26 +659,27 @@ protected Rectangle getIconsRect() {
 		// remove width of leading/trailing components
 		JComponent[] leftComponents = ltr ? getLeadingComponents() : getTrailingComponents();
 		JComponent[] rightComponents = ltr ? getTrailingComponents() : getLeadingComponents();
-		boolean leftVisible = false;
-		boolean rightVisible = false;
+		boolean leftCompVisible = false;
+		boolean rightCompVisible = false;
 		for( JComponent leftComponent : leftComponents ) {
 			if( leftComponent != null && leftComponent.isVisible() ) {
 				int w = leftComponent.getPreferredSize().width;
 				r.x += w;
 				r.width -= w;
-				leftVisible = true;
+				leftCompVisible = true;
 			}
 		}
 		for( JComponent rightComponent : rightComponents ) {
 			if( rightComponent != null && rightComponent.isVisible() ) {
 				r.width -= rightComponent.getPreferredSize().width;
-				rightVisible = true;
+				rightCompVisible = true;
 			}
 		}
 
-		// if a leading/trailing icons (or components) are shown, then the left/right insets are reduced
-		// to the top inset, which places the icon nicely centered on left/right side
-		HorizontalInsets diffInsets = getDiffInsets( leftVisible, rightVisible, ltr );
+		// if leading/trailing icons or components are shown,
+		// then the left/right insets are reduced to the top inset,
+		// which places the icon nicely centered on left/right side
+		Insets diffInsets = getDiffInsets( leftCompVisible, rightCompVisible );
 		if( diffInsets.left > 0 ) {
 			r.x -= diffInsets.left;
 			r.width += diffInsets.left;
@@ -707,6 +694,27 @@ protected Rectangle getIconsRect() {
 		return r;
 	}
 
+	private Insets getDiffInsets( boolean leftCompVisible, boolean rightCompVisible ) {
+		int left = 0;
+		int right = 0;
+		boolean ltr = isLeftToRight();
+		if( leftCompVisible || (ltr ? hasLeadingIcon() : hasTrailingIcon()) ) {
+			// reduce left inset
+			Insets insets = getComponent().getInsets();
+			int newLeftInset = Math.min( insets.left, insets.top );
+			if( newLeftInset < insets.left )
+				left = insets.left - newLeftInset;
+		}
+		if( rightCompVisible || (ltr ? hasTrailingIcon() : hasLeadingIcon()) ) {
+			// reduce right inset
+			Insets insets = getComponent().getInsets();
+			int newRightInset = Math.min( insets.right, insets.top );
+			if( newRightInset < insets.right )
+				right = insets.right - newRightInset;
+		}
+		return new Insets( 0, left, 0, right );
+	}
+
 	/** @since 2 */
 	protected boolean hasLeadingIcon() {
 		return leadingIcon != null;
@@ -1004,17 +1012,4 @@ public void changedUpdate( DocumentEvent e ) {
 			documentChanged( e );
 		}
 	}
-
-	//---- class HorizontalInsets ---------------------------------------------
-
-	private static class HorizontalInsets
-	{
-		int left;
-		int right;
-
-		HorizontalInsets( int left, int right ) {
-			this.left = left;
-			this.right = right;
-		}
-	}
 }