release 1.4

fixed focusable state when switching to/from other Laf

CHANGELOG.md

@@ -1,6 +1,49 @@
 FlatLaf Change Log
 ==================
 
+## 1.4
+
+#### New features and improvements
+
+- TextField, FormattedTextField and PasswordField: Support adding extra padding.
+  (set client property `JTextField.padding` to `Insets`).
+- PasswordField: UI delegate `FlatPasswordFieldUI` now extends `FlatTextFieldUI`
+  (instead of `BasicPasswordFieldUI`) to avoid duplicate code and for easier
+  extensibility.
+- Table and PopupFactory: Use `StackWalker` in Java 9+ for better performance.
+  (issue #334)
+- ToolBar: Paint focus indicator for focused button in toolbar. (issue #346)
+- ToolBar: Support focusable buttons in toolbar (set UI values
+  `ToolBar.focusableButtons` to `true`). (issue #346)
+
+#### Fixed bugs
+
+- ComboBox (editable) and Spinner: Increased size of internal text field to the
+  component border so that it behaves like plain text field (mouse click to left
+  of text now positions caret to first character instead of opening ComboBox
+  popup; mouse cursor is now of type "text" within the whole component, except
+  for arrow buttons). (issue #330)
+- ComboBox (not editable): Increased size of internal renderer pane to the
+  component border so that it can paint within the whole component. Also
+  increase combo box size if a custom renderer uses a border with insets that
+  are larger than the default combo box padding (`2,6,2,6`).
+- Fixed component heights at `1.25x`, `1.75x` and `2.25x` scaling factors (Java
+  8 only) so that Button, ComboBox, Spinner and TextField components (including
+  subclasses) have same heights. This increases heights of Button and TextField
+  components by:
+  - `2px` at `1.75x` in **Light** and **Dark** themes
+  - `2px` at `1.25x` and `2.25x` in **IntelliJ** and **Darcula** themes
+- OptionPane: Do not make child components, which are derived from `JPanel`,
+  non-opaque. (issue #349)
+- OptionPane: Align wrapped lines to the right if component orientation is
+  right-to-left. (issue #350)
+- PasswordField: Caps lock icon no longer painted over long text. (issue #172)
+- PasswordField: Paint caps lock icon on left side in right-to-left component
+  orientation.
+- Window decorations: Window title bar width is no longer considered when
+  calculating preferred/minimum width of window. (issue #351)
+
+
 ## 1.3
 
 #### New features and improvements
@@ -10,7 +53,7 @@ FlatLaf Change Log
   `PasswordField.focusedBackground`, `FormattedTextField.focusedBackground`,
   `TextArea.focusedBackground`, `TextPane.focusedBackground`,
   `EditorPane.focusedBackground`, `ComboBox.focusedBackground`,
-  `ComboBox.buttonFocusedBackground`, `ComboBox.popupFocusedBackground` and
+  `ComboBox.buttonFocusedBackground`, `ComboBox.popupBackground` and
   `Spinner.focusedBackground`). (issue #335)
 
 #### Fixed bugs

build.gradle.kts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-val releaseVersion = "1.3"
+val releaseVersion = "1.4"
-val developmentVersion = "1.4-SNAPSHOT"
+val developmentVersion = "1.5-SNAPSHOT"
 
 version = if( java.lang.Boolean.getBoolean( "release" ) ) releaseVersion else developmentVersion
 

flatlaf-core/build.gradle.kts

@@ -21,6 +21,12 @@ plugins {
 	`flatlaf-publish`
 }
 
+dependencies {
+	testImplementation( "org.junit.jupiter:junit-jupiter-api:5.7.2" )
+	testImplementation( "org.junit.jupiter:junit-jupiter-params" )
+	testRuntimeOnly( "org.junit.jupiter:junit-jupiter-engine" )
+}
+
 java {
 	withSourcesJar()
 	withJavadocJar()
@@ -52,6 +58,11 @@ tasks {
 	named<Jar>( "javadocJar" ) {
 		archiveBaseName.set( "flatlaf" )
 	}
+
+	test {
+		useJUnitPlatform()
+		testLogging.exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
+	}
 }
 
 flatlafPublish {

flatlaf-core/src/main/java/com/formdev/flatlaf/FlatClientProperties.java

@@ -733,6 +733,18 @@ public interface FlatClientProperties
 	 */
 	String PLACEHOLDER_TEXT = "JTextField.placeholderText";
 
+	/**
+	 * Specifies the padding of the text.
+	 * This changes the location and size of the text view within the component bounds,
+	 * but does not affect the size of the component.
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JTextField} (and subclasses)<br>
+	 * <strong>Value type</strong> {@link java.awt.Insets}
+	 *
+	 * @since 1.4
+	 */
+	String TEXT_FIELD_PADDING = "JTextField.padding";
+
 	//---- JToggleButton ------------------------------------------------------
 
 	/**

flatlaf-core/src/main/java/com/formdev/flatlaf/LinuxFontPolicy.java

@@ -309,6 +309,9 @@ class LinuxFontPolicy
 	 *   - running on JetBrains Runtime 11 or later and scaling is enabled in system Settings
 	 */
 	private static boolean isSystemScaling() {
+		if( GraphicsEnvironment.isHeadless() )
+			return true;
+
 		GraphicsConfiguration gc = GraphicsEnvironment.getLocalGraphicsEnvironment()
 			.getDefaultScreenDevice().getDefaultConfiguration();
 		return UIScale.getSystemScaleFactor( gc ) > 1;

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCapsLockIcon.java

@@ -44,7 +44,7 @@ public class FlatCapsLockIcon
 			<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
 			  <g fill="none" fill-rule="evenodd">
 			    <rect width="16" height="16" fill="#6E6E6E" rx="3"/>
-			    <rect width="6" height="2" x="5" y="12" fill="#FFF"/>
+			    <rect width="6" height="2" x="5" y="11.5" fill="#FFF"/>
     			<path fill="#FFF" d="M2,8 L8,2 L14,8 L11,8 L11,10 L5,10 L5,8 L2,8 Z"/>
 			  </g>
 			</svg>
@@ -52,7 +52,7 @@ public class FlatCapsLockIcon
 
 		Path2D path = new Path2D.Float( Path2D.WIND_EVEN_ODD );
 		path.append( new RoundRectangle2D.Float( 0, 0, 16, 16, 6, 6 ), false );
-		path.append( new Rectangle2D.Float( 5, 12, 6, 2 ), false );
+		path.append( new Rectangle2D.Float( 5, 11.5f, 6, 2 ), false );
 		path.append( FlatUIUtils.createPath( 2,8, 8,2, 14,8, 11,8, 11,10, 5,10, 5,8 ), false );
 		g.fill( path );
 	}

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

@@ -176,13 +176,14 @@ public class FlatBorder
 	@Override
 	public Insets getBorderInsets( Component c, Insets insets ) {
 		float focusWidth = scale( (float) getFocusWidth( c ) );
-		float ow = focusWidth + scale( (float) getLineWidth( c ) );
+		int ow = Math.round( focusWidth + scale( (float) getLineWidth( c ) ) );
 
 		insets = super.getBorderInsets( c, insets );
-		insets.top = Math.round( scale( (float) insets.top ) + ow );
+
-		insets.left = Math.round( scale( (float) insets.left ) + ow );
+		insets.top = scale( insets.top ) + ow;
-		insets.bottom = Math.round( scale( (float) insets.bottom ) + ow );
+		insets.left = scale( insets.left ) + ow;
-		insets.right = Math.round( scale( (float) insets.right ) + ow );
+		insets.bottom = scale( insets.bottom ) + ow;
+		insets.right = scale( insets.right ) + ow;
 
 		if( isCellEditor( c ) ) {
 			// remove top and bottom insets if used as cell editor

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

@@ -20,6 +20,7 @@ import java.awt.Color;
 import java.awt.Component;
 import java.awt.GradientPaint;
 import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.Insets;
 import java.awt.Paint;
 import javax.swing.AbstractButton;
@@ -42,11 +43,13 @@ import com.formdev.flatlaf.util.UIScale;
  * @uiDefault Button.default.hoverBorderColor	Color	optional
  * @uiDefault Button.default.focusedBorderColor	Color
  * @uiDefault Button.default.focusColor			Color
+ * @uiDefault Button.toolbar.focusColor			Color	optional; defaults to Component.focusColor
  * @uiDefault Button.borderWidth				int
  * @uiDefault Button.default.borderWidth		int
  * @uiDefault Button.innerFocusWidth			int or float	optional; defaults to Component.innerFocusWidth
  * @uiDefault Button.toolbar.margin				Insets
  * @uiDefault Button.toolbar.spacingInsets		Insets
+ * @uiDefault Button.toolbar.focusWidth			int or float		optional; default is 1
  * @uiDefault Button.arc						int
  *
  * @author Karl Tauber
@@ -64,11 +67,15 @@ public class FlatButtonBorder
 	protected final Color defaultHoverBorderColor = UIManager.getColor( "Button.default.hoverBorderColor" );
 	protected final Color defaultFocusedBorderColor = UIManager.getColor( "Button.default.focusedBorderColor" );
 	protected final Color defaultFocusColor = UIManager.getColor( "Button.default.focusColor" );
+	/** @since 1.4 */
+	protected final Color toolbarFocusColor = UIManager.getColor( "Button.toolbar.focusColor" );
 	protected final int borderWidth = UIManager.getInt( "Button.borderWidth" );
 	protected final int defaultBorderWidth = UIManager.getInt( "Button.default.borderWidth" );
 	protected final float buttonInnerFocusWidth = FlatUIUtils.getUIFloat( "Button.innerFocusWidth", innerFocusWidth );
 	protected final Insets toolbarMargin = UIManager.getInsets( "Button.toolbar.margin" );
 	protected final Insets toolbarSpacingInsets = UIManager.getInsets( "Button.toolbar.spacingInsets" );
+	/** @since 1.4 */
+	protected final float toolbarFocusWidth = FlatUIUtils.getUIFloat( "Button.toolbar.focusWidth", 1.5f );
 	protected final int arc = UIManager.getInt( "Button.arc" );
 
 	@Override
@@ -79,11 +86,41 @@ public class FlatButtonBorder
 			!FlatButtonUI.isHelpButton( c ) &&
 			!FlatToggleButtonUI.isTabButton( c ) )
 		  super.paintBorder( c, g, x, y, width, height );
+		else if( FlatButtonUI.isToolBarButton( c ) && isFocused( c ) )
+			paintToolBarFocus( c, g, x, y, width, height );
+	}
+
+	/**
+	 * @since 1.4
+	 */
+	protected void paintToolBarFocus( Component c, Graphics g, int x, int y, int width, int height ) {
+		Graphics2D g2 = (Graphics2D) g.create();
+		try {
+			FlatUIUtils.setRenderingHints( g2 );
+
+			float focusWidth = UIScale.scale( toolbarFocusWidth );
+			float arc = UIScale.scale( (float) getArc( c ) );
+			Color outlineColor = getOutlineColor( c );
+
+			Insets spacing = UIScale.scale( toolbarSpacingInsets );
+			x += spacing.left;
+			y += spacing.top;
+			width -= spacing.left + spacing.right;
+			height -= spacing.top + spacing.bottom;
+
+			g2.setColor( (outlineColor != null) ? outlineColor : getFocusColor( c ) );
+			// not using paintComponentOuterBorder() here because its round edges look too "thick"
+			FlatUIUtils.paintComponentBorder( g2, x, y, width, height, 0, focusWidth, arc );
+		} finally {
+			g2.dispose();
+		}
 	}
 
 	@Override
 	protected Color getFocusColor( Component c ) {
-		return FlatButtonUI.isDefaultButton( c ) ? defaultFocusColor : super.getFocusColor( c );
+		return (toolbarFocusColor != null && FlatButtonUI.isToolBarButton( c ))
+			? toolbarFocusColor
+			: (FlatButtonUI.isDefaultButton( c ) ? defaultFocusColor : super.getFocusColor( c ));
 	}
 
 	@Override

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

@@ -501,9 +501,9 @@ public class FlatButtonUI
 			prefSize.width = Math.max( prefSize.width, prefSize.height );
 		} else if( !isIconOnlyOrSingleCharacter && !isToolBarButton( c ) && c.getBorder() instanceof FlatButtonBorder ) {
 			// apply minimum width/height
-			float focusWidth = FlatUIUtils.getBorderFocusWidth( c );
+			int fw = Math.round( FlatUIUtils.getBorderFocusWidth( c ) * 2 );
-			prefSize.width = Math.max( prefSize.width, scale( FlatUIUtils.minimumWidth( c, minimumWidth ) ) + Math.round( focusWidth * 2 ) );
+			prefSize.width = Math.max( prefSize.width, scale( FlatUIUtils.minimumWidth( c, minimumWidth ) ) + fw );
-			prefSize.height = Math.max( prefSize.height, scale( FlatUIUtils.minimumHeight( c, 0 ) ) + Math.round( focusWidth * 2 ) );
+			prefSize.height = Math.max( prefSize.height, scale( FlatUIUtils.minimumHeight( c, 0 ) ) + fw );
 		}
 
 		return prefSize;

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

@@ -18,10 +18,13 @@ package com.formdev.flatlaf.ui;
 
 import static com.formdev.flatlaf.FlatClientProperties.*;
 import java.awt.EventQueue;
+import java.awt.Insets;
+import java.awt.Rectangle;
 import java.awt.event.FocusEvent;
 import java.awt.event.MouseEvent;
 import javax.swing.JFormattedTextField;
 import javax.swing.plaf.UIResource;
+import javax.swing.text.BadLocationException;
 import javax.swing.text.DefaultCaret;
 import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
@@ -61,6 +64,19 @@ public class FlatCaret
 		}
 	}
 
+	@Override
+	protected void adjustVisibility( Rectangle nloc ) {
+		JTextComponent c = getComponent();
+		if( c != null && c.getUI() instanceof FlatTextFieldUI ) {
+			Insets padding = ((FlatTextFieldUI)c.getUI()).getPadding();
+			if( padding != null ) {
+				nloc.x -= padding.left;
+				nloc.y -= padding.top;
+			}
+		}
+		super.adjustVisibility( nloc );
+	}
+
 	@Override
 	public void focusGained( FocusEvent e ) {
 		if( !wasTemporaryLost && (!isMousePressed || selectAllOnMouseClick) )
@@ -127,4 +143,23 @@ public class FlatCaret
 			moveDot( doc.getLength() );
 		}
 	}
+
+	/**
+	 * @since 1.4
+	 */
+	public void scrollCaretToVisible() {
+		JTextComponent c = getComponent();
+		if( c == null || c.getUI() == null )
+			return;
+
+		try {
+			Rectangle loc = c.getUI().modelToView( c, getDot(), getDotBias() );
+			if( loc != null ) {
+				adjustVisibility( loc );
+				damage( loc );
+			}
+		} catch( BadLocationException ex ) {
+			// ignore
+		}
+	}
 }

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

@@ -17,6 +17,7 @@
 package com.formdev.flatlaf.ui;
 
 import static com.formdev.flatlaf.util.UIScale.scale;
+import static com.formdev.flatlaf.util.UIScale.unscale;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.ComponentOrientation;
@@ -39,7 +40,6 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.geom.Rectangle2D;
 import java.beans.PropertyChangeListener;
-import java.lang.ref.WeakReference;
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
 import javax.swing.CellRendererPane;
@@ -68,7 +68,6 @@ import javax.swing.plaf.basic.ComboPopup;
 import javax.swing.text.JTextComponent;
 import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.util.SystemInfo;
-import com.formdev.flatlaf.util.UIScale;
 
 /**
  * Provides the Flat LaF UI delegate for {@link javax.swing.JComboBox}.
@@ -137,7 +136,7 @@ public class FlatComboBoxUI
 	protected boolean hover;
 	protected boolean pressed;
 
-	private WeakReference<Component> lastRendererComponent;
+	private CellPaddingBorder paddingBorder;
 
 	public static ComponentUI createUI( JComponent c ) {
 		return new FlatComboBoxUI();
@@ -222,8 +221,7 @@ public class FlatComboBoxUI
 		if( maximumRowCount > 0 && maximumRowCount != 8 && comboBox.getMaximumRowCount() == 8 )
 			comboBox.setMaximumRowCount( maximumRowCount );
 
-		// scale
+		paddingBorder = new CellPaddingBorder( padding );
-		padding = UIScale.scale( padding );
 
 		MigLayoutVisualPadding.install( comboBox );
 	}
@@ -250,6 +248,8 @@ public class FlatComboBoxUI
 
 		popupBackground = null;
 
+		paddingBorder.uninstall();
+
 		MigLayoutVisualPadding.uninstall( comboBox );
 	}
 
@@ -276,11 +276,6 @@ public class FlatComboBoxUI
 							editor.setBounds( rectangleForCurrentValue() );
 					}
 				}
-
-				if( editor != null && padding != null ) {
-					// fix editor bounds by subtracting padding
-					editor.setBounds( FlatUIUtils.subtractInsets( editor.getBounds(), padding ) );
-				}
 			}
 		};
 	}
@@ -371,6 +366,7 @@ public class FlatComboBoxUI
 
 		editor.applyComponentOrientation( comboBox.getComponentOrientation() );
 
+		updateEditorPadding();
 		updateEditorColors();
 
 		// macOS
@@ -387,6 +383,25 @@ public class FlatComboBoxUI
 		}
 	}
 
+	private void updateEditorPadding() {
+		if( !(editor instanceof JTextField) )
+			return;
+
+		JTextField textField = (JTextField) editor;
+		Insets insets = textField.getInsets();
+		Insets pad = padding;
+		if( insets.top != 0 || insets.left != 0 || insets.bottom != 0 || insets.right != 0 ) {
+			// if text field has custom border, subtract text field insets from padding
+			pad = new Insets(
+				unscale( Math.max( scale( padding.top ) - insets.top, 0 ) ),
+				unscale( Math.max( scale( padding.left ) - insets.left, 0 ) ),
+				unscale( Math.max( scale( padding.bottom ) - insets.bottom, 0 ) ),
+				unscale( Math.max( scale( padding.right ) - insets.right, 0 ) )
+			);
+		}
+		textField.putClientProperty( FlatClientProperties.TEXT_FIELD_PADDING, pad );
+	}
+
 	private void updateEditorColors() {
 		// use non-UIResource colors because when SwingUtilities.updateComponentTreeUI()
 		// is used, then the editor is updated after the combobox and the
@@ -471,30 +486,24 @@ public class FlatComboBoxUI
 	@Override
 	@SuppressWarnings( "unchecked" )
 	public void paintCurrentValue( Graphics g, Rectangle bounds, boolean hasFocus ) {
+		paddingBorder.uninstall();
+
 		ListCellRenderer<Object> renderer = comboBox.getRenderer();
-		uninstallCellPaddingBorder( renderer );
 		if( renderer == null )
 			renderer = new DefaultListCellRenderer();
 		Component c = renderer.getListCellRendererComponent( listBox, comboBox.getSelectedItem(), -1, false, false );
 		c.setFont( comboBox.getFont() );
 		c.applyComponentOrientation( comboBox.getComponentOrientation() );
-		uninstallCellPaddingBorder( c );
 
 		boolean enabled = comboBox.isEnabled();
 		c.setBackground( getBackground( enabled ) );
 		c.setForeground( getForeground( enabled ) );
 
 		boolean shouldValidate = (c instanceof JPanel);
-		if( padding != null )
-			bounds = FlatUIUtils.subtractInsets( bounds, padding );
-
-		// increase the size of the rendering area to make sure that the text
-		// is vertically aligned with other component types (e.g. JTextField)
-		Insets rendererInsets = getRendererComponentInsets( c );
-		if( rendererInsets != null )
-			bounds = FlatUIUtils.addInsets( bounds, rendererInsets );
 
+		paddingBorder.install( c );
 		currentValuePane.paintComponent( g, c, comboBox, bounds.x, bounds.y, bounds.width, bounds.height, shouldValidate );
+		paddingBorder.uninstall();
 	}
 
 	@Override
@@ -526,77 +535,49 @@ public class FlatComboBoxUI
 	@Override
 	public Dimension getMinimumSize( JComponent c ) {
 		Dimension minimumSize = super.getMinimumSize( c );
-		minimumSize.width = Math.max( minimumSize.width, scale( FlatUIUtils.minimumWidth( c, minimumWidth ) ) );
+		int fw = Math.round( FlatUIUtils.getBorderFocusWidth( c ) * 2 );
+		minimumSize.width = Math.max( minimumSize.width, scale( FlatUIUtils.minimumWidth( c, minimumWidth ) ) + fw );
 		return minimumSize;
 	}
 
 	@Override
 	protected Dimension getDefaultSize() {
-		@SuppressWarnings( "unchecked" )
+		paddingBorder.uninstall();
-		ListCellRenderer<Object> renderer = comboBox.getRenderer();
-		uninstallCellPaddingBorder( renderer );
-
 		Dimension size = super.getDefaultSize();
-
+		paddingBorder.uninstall();
-		uninstallCellPaddingBorder( renderer );
 		return size;
 	}
 
 	@Override
 	protected Dimension getDisplaySize() {
-		@SuppressWarnings( "unchecked" )
+		paddingBorder.uninstall();
-		ListCellRenderer<Object> renderer = comboBox.getRenderer();
-		uninstallCellPaddingBorder( renderer );
-
 		Dimension displaySize = super.getDisplaySize();
+		paddingBorder.uninstall();
+
+		// remove padding added in super.getDisplaySize()
+		int displayWidth = displaySize.width - padding.left - padding.right;
+		int displayHeight = displaySize.height - padding.top - padding.bottom;
 
 		// recalculate width without hardcoded 100 under special conditions
-		if( displaySize.width == 100 + padding.left + padding.right &&
+		if( displayWidth == 100 &&
 			comboBox.isEditable() &&
 			comboBox.getItemCount() == 0 &&
 			comboBox.getPrototypeDisplayValue() == null )
 		{
-			int width = getDefaultSize().width;
+			displayWidth = Math.max( getDefaultSize().width, editor.getPreferredSize().width );
-			width = Math.max( width, editor.getPreferredSize().width );
-			width += padding.left + padding.right;
-			displaySize = new Dimension( width, displaySize.height );
 		}
 
-		uninstallCellPaddingBorder( renderer );
+		return new Dimension( displayWidth, displayHeight );
-		return displaySize;
 	}
 
 	@Override
 	protected Dimension getSizeForComponent( Component comp ) {
+		paddingBorder.install( comp );
 		Dimension size = super.getSizeForComponent( comp );
-
+		paddingBorder.uninstall();
-		// remove the renderer border top/bottom insets from the size to make sure that
-		// the combobox gets the same height as other component types (e.g. JTextField)
-		Insets rendererInsets = getRendererComponentInsets( comp );
-		if( rendererInsets != null )
-			size = new Dimension( size.width, size.height - rendererInsets.top - rendererInsets.bottom );
-
 		return size;
 	}
 
-	private Insets getRendererComponentInsets( Component rendererComponent ) {
-		if( rendererComponent instanceof JComponent ) {
-			Border rendererBorder = ((JComponent)rendererComponent).getBorder();
-			if( rendererBorder != null )
-				return rendererBorder.getBorderInsets( rendererComponent );
-		}
-
-		return null;
-	}
-
-	private void uninstallCellPaddingBorder( Object o ) {
-		CellPaddingBorder.uninstall( o );
-		if( lastRendererComponent != null ) {
-			CellPaddingBorder.uninstall( lastRendererComponent );
-			lastRendererComponent = null;
-		}
-	}
-
 	private boolean isCellRenderer() {
 		return comboBox.getParent() instanceof CellRendererPane;
 	}
@@ -660,13 +641,11 @@ public class FlatComboBoxUI
 	protected class FlatComboPopup
 		extends BasicComboPopup
 	{
-		private CellPaddingBorder paddingBorder;
-
 		protected FlatComboPopup( JComboBox combo ) {
 			super( combo );
 
 			// BasicComboPopup listens to JComboBox.componentOrientation and updates
-			// the component orientation of the list, scroller and popup, but when
+			// the component orientation of the list, scroll pane and popup, but when
 			// switching the LaF and a new combo popup is created, the component
 			// orientation is not applied.
 			ComponentOrientation o = comboBox.getComponentOrientation();
@@ -745,6 +724,19 @@ public class FlatComboBoxUI
 			};
 		}
 
+		@Override
+		protected int getPopupHeightForRowCount( int maxRowCount ) {
+			int height = super.getPopupHeightForRowCount( maxRowCount );
+			paddingBorder.uninstall();
+			return height;
+		}
+
+		@Override
+		protected void paintChildren( Graphics g ) {
+			super.paintChildren( g );
+			paddingBorder.uninstall();
+		}
+
 		//---- class PopupListCellRenderer -----
 
 		private class PopupListCellRenderer
@@ -754,22 +746,15 @@ public class FlatComboBoxUI
 			public Component getListCellRendererComponent( JList list, Object value,
 				int index, boolean isSelected, boolean cellHasFocus )
 			{
-				ListCellRenderer renderer = comboBox.getRenderer();
+				paddingBorder.uninstall();
-				CellPaddingBorder.uninstall( renderer );
-				CellPaddingBorder.uninstall( lastRendererComponent );
 
+				ListCellRenderer renderer = comboBox.getRenderer();
 				if( renderer == null )
 					renderer = new DefaultListCellRenderer();
 				Component c = renderer.getListCellRendererComponent( list, value, index, isSelected, cellHasFocus );
 				c.applyComponentOrientation( comboBox.getComponentOrientation() );
 
-				if( c instanceof JComponent ) {
+				paddingBorder.install( c );
-					if( paddingBorder == null )
-						paddingBorder = new CellPaddingBorder( padding );
-					paddingBorder.install( (JComponent) c );
-				}
-
-				lastRendererComponent = (c != renderer) ? new WeakReference<>( c ) : null;
 
 				return c;
 			}
@@ -779,49 +764,69 @@ public class FlatComboBoxUI
 	//---- class CellPaddingBorder --------------------------------------------
 
 	/**
-	 * Cell padding border used only in popup list.
+	 * Cell padding border used in popup list and for current value if not editable.
-	 *
+	 * <p>
 	 * The insets are the union of the cell padding and the renderer border insets,
 	 * which vertically aligns text in popup list with text in combobox.
-	 *
+	 * <p>
-	 * The renderer border is painted on the outside of this border.
+	 * The renderer border is painted on the outer side of this border.
 	 */
 	private static class CellPaddingBorder
 		extends AbstractBorder
 	{
 		private final Insets padding;
+		private JComponent rendererComponent;
 		private Border rendererBorder;
 
 		CellPaddingBorder( Insets padding ) {
 			this.padding = padding;
 		}
 
-		void install( JComponent rendererComponent ) {
+		void install( Component c ) {
-			Border oldBorder = rendererComponent.getBorder();
+			if( !(c instanceof JComponent) )
-			if( !(oldBorder instanceof CellPaddingBorder) ) {
-				rendererBorder = oldBorder;
-				rendererComponent.setBorder( this );
-			}
-		}
-
-		static void uninstall( Object o ) {
-			if( o instanceof WeakReference )
-				o = ((WeakReference<?>)o).get();
-
-			if( !(o instanceof JComponent) )
 				return;
 
-			JComponent rendererComponent = (JComponent) o;
+			JComponent jc = (JComponent) c;
-			Border border = rendererComponent.getBorder();
+			Border oldBorder = jc.getBorder();
-			if( border instanceof CellPaddingBorder ) {
+			if( oldBorder == this )
-				CellPaddingBorder paddingBorder = (CellPaddingBorder) border;
+				return; // already installed
-				rendererComponent.setBorder( paddingBorder.rendererBorder );
+
-				paddingBorder.rendererBorder = null;
+			// component already has a padding border --> uninstall it
-			}
+			// (may happen if single renderer instance is used in multiple comboboxes)
+			if( oldBorder instanceof CellPaddingBorder )
+				((CellPaddingBorder)oldBorder).uninstall();
+
+			// this border can be installed only at one component
+			// (may happen if a renderer returns varying components)
+			uninstall();
+
+			// remember component where this border was installed for uninstall
+			rendererComponent = jc;
+
+			// remember old border and replace it
+			rendererBorder = jc.getBorder();
+			rendererComponent.setBorder( this );
+		}
+
+		/**
+		 * Uninstall border from previously installed component.
+		 * Because this border is installed in PopupListCellRenderer.getListCellRendererComponent(),
+		 * there is no single place to uninstall it.
+		 * This is the reason why this method is called from various places.
+		 */
+		void uninstall() {
+			if( rendererComponent == null )
+				return;
+
+			if( rendererComponent.getBorder() == this )
+				rendererComponent.setBorder( rendererBorder );
+			rendererComponent = null;
+			rendererBorder = null;
 		}
 
 		@Override
 		public Insets getBorderInsets( Component c, Insets insets ) {
+			Insets padding = scale( this.padding );
 			if( rendererBorder != null ) {
 				Insets insideInsets = rendererBorder.getBorderInsets( c );
 				insets.top = Math.max( padding.top, insideInsets.top );

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

@@ -39,8 +39,6 @@ import javax.swing.plaf.ComponentUI;
  *
  * <!-- FlatTextFieldUI -->
  *
- * @uiDefault TextComponent.arc							int
- * @uiDefault Component.focusWidth						int
  * @uiDefault Component.minimumWidth					int
  * @uiDefault Component.isIntelliJTheme					boolean
  * @uiDefault FormattedTextField.placeholderForeground	Color

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

@@ -22,7 +22,10 @@ import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.GridBagConstraints;
 import java.awt.Insets;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
 import javax.swing.JComponent;
+import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.UIManager;
 import javax.swing.border.Border;
@@ -160,12 +163,30 @@ public class FlatOptionPaneUI
 		if( msg instanceof String && BasicHTML.isHTMLString( (String) msg ) )
 			maxll = Integer.MAX_VALUE;
 
+		// fix right-to-left alignment if super.addMessageComponents() breaks longer lines
+		// into multiple labels and puts them into a box that aligns them to the left
+		if( msg instanceof Box ) {
+			Box box = (Box) msg;
+			if( "OptionPane.verticalBox".equals( box.getName() ) &&
+				box.getLayout() instanceof BoxLayout &&
+				((BoxLayout)box.getLayout()).getAxis() == BoxLayout.Y_AXIS )
+			{
+				box.addPropertyChangeListener( "componentOrientation", e -> {
+					float alignX = box.getComponentOrientation().isLeftToRight() ? 0 : 1;
+					for( Component c : box.getComponents() ) {
+						if( c instanceof JLabel && "OptionPane.label".equals( c.getName() ) )
+							((JLabel)c).setAlignmentX( alignX );
+					}
+				} );
+			}
+		}
+
 		super.addMessageComponents( container, cons, msg, maxll, internallyCreated );
 	}
 
 	private void updateChildPanels( Container c ) {
 		for( Component child : c.getComponents() ) {
-			if( child instanceof JPanel ) {
+			if( child.getClass() == JPanel.class ) {
 				JPanel panel = (JPanel)child;
 
 				// make sub-panel non-opaque for OptionPane.background
@@ -177,9 +198,8 @@ public class FlatOptionPaneUI
 					panel.setBorder( new NonUIResourceBorder( border ) );
 			}
 
-			if( child instanceof Container ) {
+			if( child instanceof Container )
 				updateChildPanels( (Container) child );
-			}
 		}
 	}
 

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

@@ -16,30 +16,31 @@
 
 package com.formdev.flatlaf.ui;
 
-import java.awt.Color;
-import java.awt.Dimension;
 import java.awt.Graphics;
-import java.awt.Graphics2D;
+import java.awt.Insets;
+import java.awt.Shape;
 import java.awt.Toolkit;
-import java.awt.event.FocusListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
-import java.beans.PropertyChangeEvent;
+import javax.swing.Action;
+import javax.swing.ActionMap;
 import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.LookAndFeel;
+import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
-import javax.swing.plaf.basic.BasicPasswordFieldUI;
+import javax.swing.text.DefaultEditorKit;
-import javax.swing.text.Caret;
+import javax.swing.text.Element;
 import javax.swing.text.JTextComponent;
-import com.formdev.flatlaf.util.HiDPIUtils;
+import javax.swing.text.PasswordView;
+import javax.swing.text.View;
 
 /**
  * Provides the Flat LaF UI delegate for {@link javax.swing.JPasswordField}.
  *
- * <!-- BasicPasswordFieldUI -->
+ * <!-- BasicTextFieldUI -->
  *
  * @uiDefault PasswordField.font					Font
  * @uiDefault PasswordField.background				Color
@@ -52,74 +53,66 @@ import com.formdev.flatlaf.util.HiDPIUtils;
  * @uiDefault PasswordField.inactiveForeground		Color	used if not enabled (yes, this is confusing; this should be named disabledForeground)
  * @uiDefault PasswordField.border					Border
  * @uiDefault PasswordField.margin					Insets
- * @uiDefault PasswordField.echoChar				character
  * @uiDefault PasswordField.caretBlinkRate			int		default is 500 milliseconds
  *
- * <!-- FlatPasswordFieldUI -->
+ * <!-- FlatTextFieldUI -->
  *
  * @uiDefault Component.minimumWidth				int
  * @uiDefault Component.isIntelliJTheme				boolean
  * @uiDefault PasswordField.placeholderForeground	Color
  * @uiDefault PasswordField.focusedBackground		Color	optional
- * @uiDefault PasswordField.showCapsLock			boolean
- * @uiDefault PasswordField.capsLockIcon			Icon
  * @uiDefault TextComponent.selectAllOnFocusPolicy	String	never, once (default) or always
  * @uiDefault TextComponent.selectAllOnMouseClick	boolean
  *
+ * <!-- FlatPasswordFieldUI -->
+ *
+ * @uiDefault PasswordField.echoChar				character
+ * @uiDefault PasswordField.showCapsLock			boolean
+ * @uiDefault PasswordField.capsLockIcon			Icon
+ *
  * @author Karl Tauber
  */
 public class FlatPasswordFieldUI
-	extends BasicPasswordFieldUI
+	extends FlatTextFieldUI
 {
-	protected int minimumWidth;
-	protected boolean isIntelliJTheme;
-	protected Color placeholderForeground;
-	protected Color focusedBackground;
 	protected boolean showCapsLock;
 	protected Icon capsLockIcon;
 
-	private FocusListener focusListener;
 	private KeyListener capsLockListener;
 
 	public static ComponentUI createUI( JComponent c ) {
 		return new FlatPasswordFieldUI();
 	}
 
+	@Override
+	protected String getPropertyPrefix() {
+		return "PasswordField";
+	}
+
 	@Override
 	protected void installDefaults() {
 		super.installDefaults();
 
 		String prefix = getPropertyPrefix();
-		minimumWidth = UIManager.getInt( "Component.minimumWidth" );
+		Character echoChar = (Character) UIManager.get( prefix + ".echoChar" );
-		isIntelliJTheme = UIManager.getBoolean( "Component.isIntelliJTheme" );
+		if( echoChar != null )
-		placeholderForeground = UIManager.getColor( prefix + ".placeholderForeground" );
+			LookAndFeel.installProperty( getComponent(), "echoChar", echoChar );
-		focusedBackground = UIManager.getColor( prefix + ".focusedBackground" );
+
 		showCapsLock = UIManager.getBoolean( "PasswordField.showCapsLock" );
 		capsLockIcon = UIManager.getIcon( "PasswordField.capsLockIcon" );
-
-		LookAndFeel.installProperty( getComponent(), "opaque", false );
-
-		MigLayoutVisualPadding.install( getComponent() );
 	}
 
 	@Override
 	protected void uninstallDefaults() {
 		super.uninstallDefaults();
 
-		placeholderForeground = null;
-		focusedBackground = null;
 		capsLockIcon = null;
-
-		MigLayoutVisualPadding.uninstall( getComponent() );
 	}
 
 	@Override
 	protected void installListeners() {
 		super.installListeners();
 
-		// necessary to update focus border and background
-		focusListener = new FlatUIUtils.RepaintFocusListener( getComponent(), null );
-
 		// update caps lock indicator
 		capsLockListener = new KeyAdapter() {
 			@Override
@@ -131,12 +124,13 @@ public class FlatPasswordFieldUI
 				repaint( e );
 			}
 			private void repaint( KeyEvent e ) {
-				if( e.getKeyCode() == KeyEvent.VK_CAPS_LOCK )
+				if( e.getKeyCode() == KeyEvent.VK_CAPS_LOCK ) {
 					e.getComponent().repaint();
+					scrollCaretToVisible();
+				}
 			}
 		};
 
-		getComponent().addFocusListener( focusListener );
 		getComponent().addKeyListener( capsLockListener );
 	}
 
@@ -144,59 +138,74 @@ public class FlatPasswordFieldUI
 	protected void uninstallListeners() {
 		super.uninstallListeners();
 
-		getComponent().removeFocusListener( focusListener );
 		getComponent().removeKeyListener( capsLockListener );
-		focusListener = null;
 		capsLockListener = null;
 	}
 
 	@Override
-	protected Caret createCaret() {
+	protected void installKeyboardActions() {
-		return new FlatCaret( UIManager.getString( "TextComponent.selectAllOnFocusPolicy" ),
+		super.installKeyboardActions();
-			UIManager.getBoolean( "TextComponent.selectAllOnMouseClick" ) );
+
+		// map "select-word" action (double-click) to "select-line" action
+		ActionMap map = SwingUtilities.getUIActionMap( getComponent() );
+		if( map != null && map.get( DefaultEditorKit.selectWordAction ) != null ) {
+			Action selectLineAction = map.get( DefaultEditorKit.selectLineAction );
+			if( selectLineAction != null )
+				map.put( DefaultEditorKit.selectWordAction, selectLineAction );
+		}
 	}
 
 	@Override
-	protected void propertyChange( PropertyChangeEvent e ) {
+	public View create( Element elem ) {
-		super.propertyChange( e );
+		return new PasswordView( elem );
-		FlatTextFieldUI.propertyChange( getComponent(), e );
 	}
 
 	@Override
 	protected void paintSafely( Graphics g ) {
-		FlatTextFieldUI.paintBackground( g, getComponent(), isIntelliJTheme, focusedBackground );
+		// safe and restore clipping area because super.paintSafely() modifies it
-		FlatTextFieldUI.paintPlaceholder( g, getComponent(), placeholderForeground );
+		// and the caps lock icon would be truncated
-		paintCapsLock( g );
+		Shape oldClip = g.getClip();
+		super.paintSafely( g );
+		g.setClip( oldClip );
 
-		super.paintSafely( HiDPIUtils.createGraphicsTextYCorrection( (Graphics2D) g ) );
+		paintCapsLock( g );
 	}
 
 	protected void paintCapsLock( Graphics g ) {
-		if( !showCapsLock )
+		if( !isCapsLockVisible() )
 			return;
 
 		JTextComponent c = getComponent();
-		if( !FlatUIUtils.isPermanentFocusOwner( c ) ||
-			!Toolkit.getDefaultToolkit().getLockingKeyState( KeyEvent.VK_CAPS_LOCK ) )
-		  return;
-
 		int y = (c.getHeight() - capsLockIcon.getIconHeight()) / 2;
-		int x = c.getWidth() - capsLockIcon.getIconWidth() - y;
+		int x = c.getComponentOrientation().isLeftToRight()
+			? c.getWidth() - capsLockIcon.getIconWidth() - y
+			: y;
 		capsLockIcon.paintIcon( c, g, x, y );
 	}
 
-	@Override
+	/**
-	protected void paintBackground( Graphics g ) {
+	 * @since 1.4
-		// background is painted elsewhere
+	 */
+	protected boolean isCapsLockVisible() {
+		if( !showCapsLock )
+			return false;
+
+		JTextComponent c = getComponent();
+		return FlatUIUtils.isPermanentFocusOwner( c ) &&
+			Toolkit.getDefaultToolkit().getLockingKeyState( KeyEvent.VK_CAPS_LOCK );
 	}
 
+	/**
+	 * @since 1.4
+	 */
 	@Override
-	public Dimension getPreferredSize( JComponent c ) {
+	protected Insets getPadding() {
-		return FlatTextFieldUI.applyMinimumWidth( c, super.getPreferredSize( c ), minimumWidth );
+		Insets padding = super.getPadding();
-	}
+		if( !isCapsLockVisible() )
+			return padding;
 
-	@Override
+		boolean ltr = getComponent().getComponentOrientation().isLeftToRight();
-	public Dimension getMinimumSize( JComponent c ) {
+		int iconWidth = capsLockIcon.getIconWidth();
-		return FlatTextFieldUI.applyMinimumWidth( c, super.getMinimumSize( c ), minimumWidth );
+		return FlatUIUtils.addInsets( padding, new Insets( 0, ltr ? 0 : iconWidth, 0, ltr ? iconWidth : 0 ) );
 	}
 }

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

@@ -44,6 +44,7 @@ import javax.swing.Popup;
 import javax.swing.PopupFactory;
 import javax.swing.RootPaneContainer;
 import javax.swing.SwingUtilities;
+import javax.swing.ToolTipManager;
 import javax.swing.UIManager;
 import javax.swing.border.Border;
 import com.formdev.flatlaf.FlatClientProperties;
@@ -260,13 +261,7 @@ public class FlatPopupFactory
 	}
 
 	private boolean wasInvokedFromToolTipManager() {
-		StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
+		return StackUtils.wasInvokedFrom( ToolTipManager.class.getName(), "showTipWindow", 8 );
-		for( StackTraceElement stackTraceElement : stackTrace ) {
-			if( "javax.swing.ToolTipManager".equals( stackTraceElement.getClassName() ) &&
-				"showTipWindow".equals( stackTraceElement.getMethodName() ) )
-			  return true;
-		}
-		return false;
 	}
 
 	//---- class NonFlashingPopup ---------------------------------------------

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

@@ -342,7 +342,7 @@ public class FlatRootPaneUI
 				? getSizeFunc.apply( rootPane.getContentPane() )
 				: rootPane.getSize();
 
-			int width = Math.max( titlePaneSize.width, contentSize.width );
+			int width = contentSize.width; // title pane width is not considered here
 			int height = titlePaneSize.height + contentSize.height;
 			if( titlePane == null || !titlePane.isMenuBarEmbedded() ) {
 				JMenuBar menuBar = rootPane.getJMenuBar();

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

@@ -123,9 +123,6 @@ public class FlatSpinnerUI
 		buttonPressedArrowColor = UIManager.getColor( "Spinner.buttonPressedArrowColor" );
 		padding = UIManager.getInsets( "Spinner.padding" );
 
-		// scale
-		padding = scale( padding );
-
 		MigLayoutVisualPadding.install( spinner );
 	}
 
@@ -184,6 +181,7 @@ public class FlatSpinnerUI
 		if( textField != null )
 			textField.setOpaque( false );
 
+		updateEditorPadding();
 		updateEditorColors();
 		return editor;
 	}
@@ -194,6 +192,8 @@ public class FlatSpinnerUI
 
 		removeEditorFocusListener( oldEditor );
 		addEditorFocusListener( newEditor );
+
+		updateEditorPadding();
 		updateEditorColors();
 	}
 
@@ -209,6 +209,12 @@ public class FlatSpinnerUI
 			textField.removeFocusListener( getHandler() );
 	}
 
+	private void updateEditorPadding() {
+		JTextField textField = getEditorTextField( spinner.getEditor() );
+		if( textField != null )
+			textField.putClientProperty( FlatClientProperties.TEXT_FIELD_PADDING, padding );
+	}
+
 	private void updateEditorColors() {
 		JTextField textField = getEditorTextField( spinner.getEditor() );
 		if( textField != null ) {
@@ -373,6 +379,7 @@ public class FlatSpinnerUI
 		@Override
 		public Dimension preferredLayoutSize( Container parent ) {
 			Insets insets = parent.getInsets();
+			Insets padding = scale( FlatSpinnerUI.this.padding );
 			Dimension editorSize = (editor != null) ? editor.getPreferredSize() : new Dimension( 0, 0 );
 
 			// the arrows width is the same as the inner height so that the arrows area is square
@@ -397,7 +404,7 @@ public class FlatSpinnerUI
 
 			if( nextButton == null && previousButton == null ) {
 				if( editor != null )
-					editor.setBounds( FlatUIUtils.subtractInsets( r, padding ) );
+					editor.setBounds( r );
 				return;
 			}
 
@@ -417,7 +424,7 @@ public class FlatSpinnerUI
 			}
 
 			if( editor != null )
-				editor.setBounds( FlatUIUtils.subtractInsets( editorRect, padding ) );
+				editor.setBounds( editorRect );
 
 			int nextHeight = (buttonsRect.height / 2) + (buttonsRect.height % 2); // round up
 			if( nextButton != null )

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

@@ -842,6 +842,17 @@ public class FlatTabbedPaneUI
 			paintTabArea( g, tabPlacement, selectedIndex );
 	}
 
+	@Override
+	protected void paintTabArea( Graphics g, int tabPlacement, int selectedIndex ) {
+		// need to set rendering hints here too because this method is also invoked
+		// from BasicTabbedPaneUI.ScrollableTabPanel.paintComponent()
+		Object[] oldHints = FlatUIUtils.setRenderingHints( g );
+
+		super.paintTabArea( g, tabPlacement, selectedIndex );
+
+		FlatUIUtils.resetRenderingHints( g, oldHints );
+	}
+
 	@Override
 	protected void paintTab( Graphics g, int tabPlacement, Rectangle[] rects,
 		int tabIndex, Rectangle iconRect, Rectangle textRect )

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

@@ -240,7 +240,7 @@ public class FlatTableUI
 					if( isDragging &&
 						SystemInfo.isJava_9_orLater &&
 						((horizontalLines && y1 == y2) || (verticalLines && x1 == x2)) &&
-						wasInvokedFromPaintDraggedArea() )
+						wasInvokedFromMethod( "paintDraggedArea" ) )
 					{
 						if( y1 == y2 ) {
 							// horizontal grid line
@@ -282,22 +282,8 @@ public class FlatTableUI
 					return wasInvokedFromMethod( "paintGrid" );
 				}
 
-				private boolean wasInvokedFromPaintDraggedArea() {
-					return wasInvokedFromMethod( "paintDraggedArea" );
-				}
-
 				private boolean wasInvokedFromMethod( String methodName ) {
-					StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
+					return StackUtils.wasInvokedFrom( BasicTableUI.class.getName(), methodName, 8 );
-					for( int i = 0; i < 10 || i < stackTrace.length; i++ ) {
-						if( "javax.swing.plaf.basic.BasicTableUI".equals( stackTrace[i].getClassName() ) ) {
-							String methodName2 = stackTrace[i].getMethodName();
-							if( "paintCell".equals( methodName2 ) )
-								return false;
-							if( methodName.equals( methodName2 ) )
-								return true;
-						}
-					}
-					return false;
 				}
 			};
 		}

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

@@ -24,6 +24,7 @@ import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Insets;
+import java.awt.Rectangle;
 import java.awt.event.FocusListener;
 import java.beans.PropertyChangeEvent;
 import javax.swing.JComboBox;
@@ -40,6 +41,7 @@ import javax.swing.text.JTextComponent;
 import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.util.HiDPIUtils;
 import com.formdev.flatlaf.util.JavaCompatibility;
+import com.formdev.flatlaf.util.UIScale;
 
 /**
  * Provides the Flat LaF UI delegate for {@link javax.swing.JTextField}.
@@ -142,6 +144,7 @@ public class FlatTextFieldUI
 		switch( e.getPropertyName() ) {
 			case FlatClientProperties.PLACEHOLDER_TEXT:
 			case FlatClientProperties.COMPONENT_ROUND_RECT:
+			case FlatClientProperties.TEXT_FIELD_PADDING:
 				c.repaint();
 				break;
 
@@ -154,7 +157,7 @@ public class FlatTextFieldUI
 	@Override
 	protected void paintSafely( Graphics g ) {
 		paintBackground( g, getComponent(), isIntelliJTheme, focusedBackground );
-		paintPlaceholder( g, getComponent(), placeholderForeground );
+		paintPlaceholder( g );
 
 		super.paintSafely( HiDPIUtils.createGraphicsTextYCorrection( (Graphics2D) g ) );
 	}
@@ -210,7 +213,9 @@ public class FlatTextFieldUI
 		return background;
 	}
 
-	static void paintPlaceholder( Graphics g, JTextComponent c, Color placeholderForeground ) {
+	protected void paintPlaceholder( Graphics g ) {
+		JTextComponent c = getComponent();
+
 		// check whether text component is empty
 		if( c.getDocument().getLength() > 0 )
 			return;
@@ -225,16 +230,14 @@ public class FlatTextFieldUI
 			return;
 
 		// compute placeholder location
-		Insets insets = c.getInsets();
+		Rectangle r = getVisibleEditorRect();
 		FontMetrics fm = c.getFontMetrics( c.getFont() );
-		int x = insets.left;
+		int y = r.y + fm.getAscent() + ((r.height - fm.getHeight()) / 2);
-		int y = insets.top + fm.getAscent() + ((c.getHeight() - insets.top - insets.bottom - fm.getHeight()) / 2);
 
 		// paint placeholder
 		g.setColor( placeholderForeground );
-		String clippedPlaceholder = JavaCompatibility.getClippedString( jc, fm,
+		String clippedPlaceholder = JavaCompatibility.getClippedString( c, fm, (String) placeholder, r.width );
-				(String) placeholder, c.getWidth() - insets.left - insets.right );
+		FlatUIUtils.drawString( c, g, clippedPlaceholder, r.x, y );
-		FlatUIUtils.drawString( c, g, clippedPlaceholder, x, y );
 	}
 
 	@Override
@@ -264,4 +267,36 @@ public class FlatTextFieldUI
 		size.width = Math.max( size.width, scale( minimumWidth ) + Math.round( focusWidth * 2 ) );
 		return size;
 	}
+
+	@Override
+	protected Rectangle getVisibleEditorRect() {
+		Rectangle r = super.getVisibleEditorRect();
+		if( r != null ) {
+			// remove padding
+			Insets padding = getPadding();
+			if( padding != null ) {
+				r = FlatUIUtils.subtractInsets( r, padding );
+				r.width = Math.max( r.width, 0 );
+				r.height = Math.max( r.height, 0 );
+			}
+		}
+		return r;
+	}
+
+	/**
+	 * @since 1.4
+	 */
+	protected Insets getPadding() {
+		Object padding = getComponent().getClientProperty( FlatClientProperties.TEXT_FIELD_PADDING );
+		return (padding instanceof Insets) ? UIScale.scale( (Insets) padding ) : null;
+	}
+
+	/**
+	 * @since 1.4
+	 */
+	protected void scrollCaretToVisible() {
+		Caret caret = getComponent().getCaret();
+		if( caret instanceof FlatCaret )
+			((FlatCaret)caret).scrollCaretToVisible();
+	}
 }

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

@@ -22,6 +22,7 @@ import java.awt.event.ContainerEvent;
 import java.awt.event.ContainerListener;
 import javax.swing.AbstractButton;
 import javax.swing.JComponent;
+import javax.swing.UIManager;
 import javax.swing.border.Border;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicToolBarUI;
@@ -41,15 +42,47 @@ import javax.swing.plaf.basic.BasicToolBarUI;
  * @uiDefault ToolBar.floatingForeground				Color
  * @uiDefault ToolBar.isRollover						boolean
  *
+ * <!-- FlatToolBarUI -->
+ *
+ * @uiDefault ToolBar.focusableButtons					boolean
+ *
  * @author Karl Tauber
  */
 public class FlatToolBarUI
 	extends BasicToolBarUI
 {
+	/** @since 1.4 */
+	protected boolean focusableButtons;
+
 	public static ComponentUI createUI( JComponent c ) {
 		return new FlatToolBarUI();
 	}
 
+	@Override
+	public void installUI( JComponent c ) {
+		super.installUI( c );
+
+		// disable focusable state of buttons (when switching from another Laf)
+		if( !focusableButtons )
+			setButtonsFocusable( false );
+	}
+
+	@Override
+	public void uninstallUI( JComponent c ) {
+		super.uninstallUI( c );
+
+		// re-enable focusable state of buttons (when switching to another Laf)
+		if( !focusableButtons )
+			setButtonsFocusable( true );
+	}
+
+	@Override
+	protected void installDefaults() {
+		super.installDefaults();
+
+		focusableButtons = UIManager.getBoolean( "ToolBar.focusableButtons" );
+	}
+
 	@Override
 	protected ContainerListener createToolBarContListener() {
 		return new ToolBarContListener() {
@@ -57,22 +90,36 @@ public class FlatToolBarUI
 			public void componentAdded( ContainerEvent e ) {
 				super.componentAdded( e );
 
-				Component c = e.getChild();
+				if( !focusableButtons ) {
-				if( c instanceof AbstractButton )
+					Component c = e.getChild();
-					c.setFocusable( false );
+					if( c instanceof AbstractButton )
+						c.setFocusable( false );
+				}
 			}
 
 			@Override
 			public void componentRemoved( ContainerEvent e ) {
 				super.componentRemoved( e );
 
-				Component c = e.getChild();
+				if( !focusableButtons ) {
-				if( c instanceof AbstractButton )
+					Component c = e.getChild();
-					c.setFocusable( true );
+					if( c instanceof AbstractButton )
+						c.setFocusable( true );
+				}
 			}
 		};
 	}
 
+	/**
+	 * @since 1.4
+	 */
+	protected void setButtonsFocusable( boolean focusable ) {
+		for( Component c : toolBar.getComponents() ) {
+			if( c instanceof AbstractButton )
+				c.setFocusable( focusable );
+		}
+	}
+
 	// disable rollover border
 	@Override protected void setBorderToRollover( Component c ) {}
 	@Override protected void setBorderToNonRollover( Component c ) {}

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

@@ -94,6 +94,11 @@ public class FlatUIUtils
 	}
 
 	public static Insets addInsets( Insets insets1, Insets insets2 ) {
+		if( insets1 == null )
+			return insets2;
+		if( insets2 == null )
+			return insets1;
+
 		return new Insets(
 			insets1.top + insets2.top,
 			insets1.left + insets2.left,

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

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2021 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.ui;
+
+import java.util.function.BiPredicate;
+
+/**
+ * @author Karl Tauber
+ */
+class StackUtils
+{
+	private static final StackUtils INSTANCE = new StackUtilsImpl();
+
+	// hide from javadoc
+	StackUtils() {
+	}
+
+	/**
+	 * Checks whether current method was invoked from the given class and method.
+	 */
+	public static boolean wasInvokedFrom( String className, String methodName, int limit ) {
+		return wasInvokedFrom( (c,m) -> c.equals( className ) && m.equals( methodName ), limit );
+	}
+
+	/**
+	 * Checks whether current method was invoked from a class and method using the given predicate,
+	 * which gets the class name of the stack frame as first parameter and the method name as second parameter.
+	 */
+	public static boolean wasInvokedFrom( BiPredicate<String, String> predicate, int limit ) {
+		return INSTANCE.wasInvokedFromImpl( predicate, limit );
+	}
+
+	boolean wasInvokedFromImpl( BiPredicate<String, String> predicate, int limit ) {
+		throw new UnsupportedOperationException();
+	}
+}

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

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2021 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.ui;
+
+import java.util.function.BiPredicate;
+
+/**
+ * @author Karl Tauber
+ */
+class StackUtilsImpl
+	extends StackUtils
+{
+	@Override
+	boolean wasInvokedFromImpl( BiPredicate<String, String> predicate, int limit ) {
+		int count = -2;
+		StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
+		for( StackTraceElement stackTraceElement : stackTrace ) {
+			if( predicate.test( stackTraceElement.getClassName(), stackTraceElement.getMethodName() ) )
+				return true;
+
+			count++;
+			if( limit > 0 && count > limit )
+				return false;
+		}
+		return false;
+	}
+}

flatlaf-core/src/main/java9/com/formdev/flatlaf/ui/StackUtilsImpl.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2021 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.ui;
+
+import java.util.function.BiPredicate;
+
+/**
+ * @author Karl Tauber
+ */
+class StackUtilsImpl
+	extends StackUtils
+{
+	@Override
+	boolean wasInvokedFromImpl( BiPredicate<String, String> predicate, int limit ) {
+		return StackWalker.getInstance().walk( stream -> {
+			if( limit > 0 )
+				stream = stream.limit( limit + 2 );
+			return stream.anyMatch( f -> {
+				return predicate.test( f.getClassName(), f.getMethodName() );
+			} );
+		} );
+	}
+}

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

@@ -752,6 +752,7 @@ ToolBar.separatorWidth = 7
 ToolBar.separatorColor = $Separator.foreground
 
 ToolBar.spacingBorder = $Button.toolbar.spacingInsets
+ToolBar.focusableButtons = false
 
 
 #---- ToolTipManager ----

flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatComponentSizes.java

@@ -0,0 +1,203 @@
+/*
+ * Copyright 2021 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.ui;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Insets;
+import javax.swing.*;
+import javax.swing.border.Border;
+import javax.swing.border.LineBorder;
+import javax.swing.plaf.basic.BasicComboBoxEditor;
+import javax.swing.plaf.basic.BasicComboBoxRenderer;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import com.formdev.flatlaf.util.UIScale;
+
+/**
+ * @author Karl Tauber
+ */
+public class TestFlatComponentSizes
+{
+	@BeforeAll
+	static void setup() {
+		TestUtils.setup( false );
+	}
+
+	@AfterAll
+	static void cleanup() {
+		TestUtils.cleanup();
+	}
+
+	static float[] factors() {
+		return TestUtils.FACTORS;
+	}
+
+	@ParameterizedTest
+	@MethodSource( "factors" )
+	void sizes( float factor ) {
+		TestUtils.scaleFont( factor );
+
+
+		// should have same default size (minimumWidth is 64)
+		JTextField textField = new JTextField();
+		JFormattedTextField formattedTextField = new JFormattedTextField();
+		JPasswordField passwordField = new JPasswordField();
+		JSpinner spinner = new JSpinner();
+
+		Dimension textFieldSize = textField.getPreferredSize();
+		assertEquals( textFieldSize, formattedTextField.getPreferredSize() );
+		assertEquals( textFieldSize, passwordField.getPreferredSize() );
+		assertEquals( textFieldSize, spinner.getPreferredSize() );
+
+
+		// should have same default size (minimumWidth is 72)
+		JButton button = new JButton( "text" );
+		JComboBox<String> comboBox = new JComboBox<>();
+		JComboBox<String> comboBoxEditable = new JComboBox<>();
+		comboBoxEditable.setEditable( true );
+
+		Dimension buttonSize = button.getPreferredSize();
+		assertEquals( buttonSize, comboBox.getPreferredSize() );
+		assertEquals( buttonSize, comboBoxEditable.getPreferredSize() );
+
+
+		// should have same height
+		JToggleButton toggleButton = new JToggleButton( "text" );
+
+		assertEquals( textFieldSize.height, button.getPreferredSize().height );
+		assertEquals( textFieldSize.height, toggleButton.getPreferredSize().height );
+
+
+		// should have same size
+		JCheckBox checkBox = new JCheckBox( "text" );
+		JRadioButton radioButton = new JRadioButton( "text" );
+		assertEquals( checkBox.getPreferredSize(), radioButton.getPreferredSize() );
+
+
+		// should have same size
+		JMenu menu = new JMenu( "text" );
+		JMenuItem menuItem = new JMenuItem( "text" );
+		JCheckBoxMenuItem checkBoxMenuItem = new JCheckBoxMenuItem( "text" );
+		JRadioButtonMenuItem radioButtonMenuItem = new JRadioButtonMenuItem( "text" );
+
+		Dimension menuSize = menu.getPreferredSize();
+		assertEquals( menuSize, menuItem.getPreferredSize() );
+		assertEquals( menuSize, checkBoxMenuItem.getPreferredSize() );
+		assertEquals( menuSize, radioButtonMenuItem.getPreferredSize() );
+
+
+		TestUtils.resetFont();
+	}
+
+	@ParameterizedTest
+	@MethodSource( "factors" )
+	void comboBox( float factor ) {
+		TestUtils.scaleFont( factor );
+
+		String[] items = { "t" };
+		JComboBox<String> comboBox = new JComboBox<>( items );
+		JComboBox<String> comboBox2 = new JComboBox<>( items );
+		JComboBox<String> comboBox3 = new JComboBox<>( items );
+		JComboBox<String> comboBox4 = new JComboBox<>( items );
+
+		applyCustomComboBoxRendererBorder( comboBox2, new LineBorder( Color.orange, UIScale.scale( 6 ) ) );
+		applyCustomComboBoxRendererBorder( comboBox3, new BorderWithIcon() );
+		applyCustomComboBoxRendererBorder( comboBox4, null );
+
+		Dimension size = comboBox.getPreferredSize();
+		assertEquals( size.width, comboBox2.getPreferredSize().width );
+		assertEquals( size.height - (2 * UIScale.scale( 2 )) + (2 * UIScale.scale( 6 )), comboBox2.getPreferredSize().height );
+		assertEquals( size, comboBox3.getPreferredSize() );
+		assertEquals( size, comboBox4.getPreferredSize() );
+
+		TestUtils.resetFont();
+	}
+
+	@SuppressWarnings( "unchecked" )
+	private void applyCustomComboBoxRendererBorder( JComboBox<String> comboBox, Border border ) {
+		BasicComboBoxRenderer customRenderer = new BasicComboBoxRenderer();
+		customRenderer.setBorder( border );
+		comboBox.setRenderer( customRenderer );
+	}
+
+	@ParameterizedTest
+	@MethodSource( "factors" )
+	void comboBoxEditable( float factor ) {
+		TestUtils.scaleFont( factor );
+
+		String[] items = { "t" };
+		JComboBox<String> comboBox = new JComboBox<>( items );
+		JComboBox<String> comboBox2 = new JComboBox<>( items );
+		JComboBox<String> comboBox3 = new JComboBox<>( items );
+		JComboBox<String> comboBox4 = new JComboBox<>( items );
+
+		comboBox.setEditable( true );
+		comboBox2.setEditable( true );
+		comboBox3.setEditable( true );
+		comboBox4.setEditable( true );
+
+		applyCustomComboBoxEditorBorder( comboBox2, new LineBorder( Color.orange, UIScale.scale( 6 ) ) );
+		applyCustomComboBoxEditorBorder( comboBox3, new BorderWithIcon() );
+		applyCustomComboBoxEditorBorder( comboBox4, null );
+
+		Dimension size = comboBox.getPreferredSize();
+		assertEquals( size.width, comboBox2.getPreferredSize().width );
+		assertEquals( size.height - (2 * UIScale.scale( 2 )) + (2 * UIScale.scale( 6 )), comboBox2.getPreferredSize().height );
+		assertEquals( size, comboBox3.getPreferredSize() );
+		assertEquals( size, comboBox4.getPreferredSize() );
+
+		TestUtils.resetFont();
+	}
+
+	private void applyCustomComboBoxEditorBorder( JComboBox<String> comboBox, Border border ) {
+		JTextField customTextField = new JTextField();
+		if( border != null )
+			customTextField.setBorder( border );
+		comboBox.setEditor( new BasicComboBoxEditor() {
+			@Override
+			protected JTextField createEditorComponent() {
+				return customTextField;
+			}
+		} );
+	}
+
+	//---- class BorderWithIcon -----------------------------------------------
+
+	private static class BorderWithIcon
+		implements Border
+	{
+		@Override
+		public void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
+		}
+
+		@Override
+		public boolean isBorderOpaque() {
+			return false;
+		}
+
+		@Override
+		public Insets getBorderInsets( Component c ) {
+			return new Insets( 0, 0, 0, UIScale.scale( 16 ) + 4 );
+		}
+	}
+}

flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatComponentSizesWithFocus.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2021 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.ui;
+
+import org.junit.jupiter.api.BeforeAll;
+
+/**
+ * @author Karl Tauber
+ */
+public class TestFlatComponentSizesWithFocus
+	extends TestFlatComponentSizes
+{
+	@BeforeAll
+	static void setup() {
+		TestUtils.setup( true );
+	}
+}

flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestUtils.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2021 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.ui;
+
+import java.awt.Font;
+import javax.swing.UIManager;
+import com.formdev.flatlaf.FlatIntelliJLaf;
+import com.formdev.flatlaf.FlatLightLaf;
+import com.formdev.flatlaf.FlatSystemProperties;
+
+/**
+ * @author Karl Tauber
+ */
+public class TestUtils
+{
+	public static final float[] FACTORS = new float[] { 1f, 1.25f, 1.5f, 1.75f, 2f, 2.25f, 2.5f, 2.75f, 3f, 3.25f, 3.5f, 3.75f, 4f, 5f, 6f };
+
+	public static void setup( boolean withFocus ) {
+		System.setProperty( FlatSystemProperties.UI_SCALE, "1x" );
+		if( withFocus )
+			FlatIntelliJLaf.setup();
+		else
+			FlatLightLaf.setup();
+		System.clearProperty( FlatSystemProperties.UI_SCALE );
+	}
+
+	public static void cleanup() {
+		UIManager.put( "defaultFont", null );
+	}
+
+	public static void scaleFont( float factor ) {
+		Font defaultFont = UIManager.getLookAndFeelDefaults().getFont( "defaultFont" );
+		UIManager.put( "defaultFont", defaultFont.deriveFont( (float) Math.round( defaultFont.getSize() * factor ) ) );
+	}
+
+	public static void resetFont() {
+		UIManager.put( "defaultFont", null );
+	}
+}

flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ControlBar.java

@@ -28,6 +28,7 @@ import javax.swing.plaf.metal.MetalLookAndFeel;
 import javax.swing.plaf.nimbus.NimbusLookAndFeel;
 import com.formdev.flatlaf.*;
 import com.formdev.flatlaf.extras.FlatAnimatedLafChange;
+import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.SystemInfo;
 import com.formdev.flatlaf.util.UIScale;
 import net.miginfocom.layout.ConstraintParser;
@@ -240,7 +241,7 @@ class ControlBar
 					frame.setSize( Math.max( prefSize.width, width ), Math.max( prefSize.height, height ) );
 
 			} catch( Exception ex ) {
-				ex.printStackTrace();
+				LoggingFacade.INSTANCE.logSevere( null, ex );
 			}
 		} );
 	}

flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoPrefs.java

@@ -25,6 +25,7 @@ import com.formdev.flatlaf.FlatLightLaf;
 import com.formdev.flatlaf.FlatPropertiesLaf;
 import com.formdev.flatlaf.IntelliJTheme;
 import com.formdev.flatlaf.demo.intellijthemes.IJThemesPanel;
+import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.StringUtils;
 
 /**
@@ -83,7 +84,7 @@ public class DemoPrefs
 					UIManager.setLookAndFeel( lafClassName );
 			}
 		} catch( Throwable ex ) {
-			ex.printStackTrace();
+			LoggingFacade.INSTANCE.logSevere( null, ex );
 
 			// fallback
 			FlatLightLaf.setup();

flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesClassGenerator.java

@@ -22,6 +22,7 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
+import com.formdev.flatlaf.util.LoggingFacade;
 
 /**
  * This tool creates look and feel classes for all themes listed in themes.json.
@@ -120,7 +121,7 @@ public class IJThemesClassGenerator
 			Files.write( out, content.getBytes( StandardCharsets.ISO_8859_1 ),
 				StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING );
 		} catch( IOException ex ) {
-			ex.printStackTrace();
+			LoggingFacade.INSTANCE.logSevere( null, ex );
 		}
 	}
 

flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesManager.java

@@ -26,6 +26,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import com.formdev.flatlaf.json.Json;
+import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.StringUtils;
 
 /**
@@ -46,7 +47,7 @@ class IJThemesManager
 	    try( Reader reader = new InputStreamReader( getClass().getResourceAsStream( "themes.json" ), StandardCharsets.UTF_8 ) ) {
 	    		json = (Map<String, Object>) Json.parse( reader );
 		} catch( IOException ex ) {
-			ex.printStackTrace();
+			LoggingFacade.INSTANCE.logSevere( null, ex );
 			return;
 		}
 

flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesPanel.java

@@ -52,6 +52,7 @@ import com.formdev.flatlaf.IntelliJTheme;
 import com.formdev.flatlaf.demo.DemoPrefs;
 import com.formdev.flatlaf.extras.FlatAnimatedLafChange;
 import com.formdev.flatlaf.extras.FlatSVGIcon;
+import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.StringUtils;
 import net.miginfocom.swing.*;
 
@@ -259,7 +260,7 @@ public class IJThemesPanel
 			try {
 				UIManager.setLookAndFeel( themeInfo.lafClassName );
 			} catch( Exception ex ) {
-				ex.printStackTrace();
+				LoggingFacade.INSTANCE.logSevere( null, ex );
 				showInformationDialog( "Failed to create '" + themeInfo.lafClassName + "'.", ex );
 			}
 		} else if( themeInfo.themeFile != null ) {
@@ -273,7 +274,7 @@ public class IJThemesPanel
 
 				DemoPrefs.getState().put( DemoPrefs.KEY_LAF_THEME, DemoPrefs.FILE_PREFIX + themeInfo.themeFile );
 			} catch( Exception ex ) {
-				ex.printStackTrace();
+				LoggingFacade.INSTANCE.logSevere( null, ex );
 				showInformationDialog( "Failed to load '" + themeInfo.themeFile + "'.", ex );
 			}
 		} else {

flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesUpdater.java

@@ -23,6 +23,7 @@ import java.net.URLConnection;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
+import com.formdev.flatlaf.util.LoggingFacade;
 
 /**
  * This tool updates all IntelliJ themes listed in themes.json by downloading
@@ -61,7 +62,7 @@ public class IJThemesUpdater
 			URLConnection con = url.openConnection();
 			Files.copy( con.getInputStream(), out, StandardCopyOption.REPLACE_EXISTING );
 		} catch( IOException ex ) {
-			ex.printStackTrace();
+			LoggingFacade.INSTANCE.logSevere( null, ex );
 		}
 	}
 }

flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java

@@ -42,6 +42,7 @@ import com.formdev.flatlaf.FlatLaf.DisabledIconProvider;
 import com.formdev.flatlaf.ui.FlatUIUtils;
 import com.formdev.flatlaf.util.Graphics2DProxy;
 import com.formdev.flatlaf.util.GrayFilter;
+import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.MultiResolutionImageSupport;
 import com.formdev.flatlaf.util.UIScale;
 import com.kitfox.svg.SVGDiagram;
@@ -335,7 +336,7 @@ public class FlatSVGIcon
 		try {
 			diagram = svgUniverse.getDiagram( url.toURI() );
 		} catch( URISyntaxException ex ) {
-			ex.printStackTrace();
+			LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to load SVG icon '" + url + "'.", ex );
 		}
 	}
 

flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatUIDefaultsInspector.java

@@ -52,6 +52,7 @@ import com.formdev.flatlaf.ui.FlatUIUtils;
 import com.formdev.flatlaf.util.DerivedColor;
 import com.formdev.flatlaf.util.GrayFilter;
 import com.formdev.flatlaf.util.HSLColor;
+import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.ScaledEmptyBorder;
 import com.formdev.flatlaf.util.UIScale;
 
@@ -377,11 +378,12 @@ public class FlatUIDefaultsInspector
 	}
 
 	private Properties loadDerivedColorKeys() {
+		String name = "/com/formdev/flatlaf/extras/resources/DerivedColorKeys.properties";
 		Properties properties = new Properties();
-		try( InputStream in = getClass().getResourceAsStream( "/com/formdev/flatlaf/extras/resources/DerivedColorKeys.properties" ) ) {
+		try( InputStream in = getClass().getResourceAsStream( name ) ) {
 			properties.load( in );
 		} catch( IOException ex ) {
-			ex.printStackTrace();
+			LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to load '" + name + "'.", ex );
 		}
 		return properties;
 	}

flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatComponentExtension.java

@@ -20,6 +20,7 @@ import java.awt.Color;
 import java.awt.Insets;
 import javax.swing.JComponent;
 import javax.swing.UIManager;
+import com.formdev.flatlaf.util.LoggingFacade;
 
 /**
  * Base interface for all FlatLaf component extensions.
@@ -87,7 +88,7 @@ public interface FlatComponentExtension
 			try {
 				return Enum.valueOf( enumType, (String) value );
 			} catch( IllegalArgumentException ex ) {
-				ex.printStackTrace();
+				LoggingFacade.INSTANCE.logSevere( "FlatLaf: Unknown enum value '" + value + "' in enum '" + enumType.getName() + "'.", ex );
 			}
 		}
 		return defaultValue;

flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatFormattedTextField.java

@@ -18,6 +18,7 @@ package com.formdev.flatlaf.extras.components;
 
 import static com.formdev.flatlaf.FlatClientProperties.*;
 import java.awt.Color;
+import java.awt.Insets;
 import javax.swing.JFormattedTextField;
 import com.formdev.flatlaf.extras.components.FlatTextField.SelectAllOnFocusPolicy;
 
@@ -61,6 +62,27 @@ public class FlatFormattedTextField
 	}
 
 
+	/**
+	 * Returns the padding of the text.
+	 *
+	 * @since 1.4
+	 */
+	public Insets getPadding() {
+		return (Insets) getClientProperty( TEXT_FIELD_PADDING );
+	}
+
+	/**
+	 * Specifies the padding of the text.
+	 * This changes the location and size of the text view within the component bounds,
+	 * but does not affect the size of the component.
+	 *
+	 * @since 1.4
+	 */
+	public void setPadding( Insets padding ) {
+		putClientProperty( TEXT_FIELD_PADDING, padding );
+	}
+
+
 	/**
 	 * Returns minimum width of a component.
 	 */

flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatPasswordField.java

@@ -18,6 +18,7 @@ package com.formdev.flatlaf.extras.components;
 
 import static com.formdev.flatlaf.FlatClientProperties.*;
 import java.awt.Color;
+import java.awt.Insets;
 import javax.swing.JPasswordField;
 import com.formdev.flatlaf.extras.components.FlatTextField.SelectAllOnFocusPolicy;
 
@@ -61,6 +62,27 @@ public class FlatPasswordField
 	}
 
 
+	/**
+	 * Returns the padding of the text.
+	 *
+	 * @since 1.4
+	 */
+	public Insets getPadding() {
+		return (Insets) getClientProperty( TEXT_FIELD_PADDING );
+	}
+
+	/**
+	 * Specifies the padding of the text.
+	 * This changes the location and size of the text view within the component bounds,
+	 * but does not affect the size of the component.
+	 *
+	 * @since 1.4
+	 */
+	public void setPadding( Insets padding ) {
+		putClientProperty( TEXT_FIELD_PADDING, padding );
+	}
+
+
 	/**
 	 * Returns minimum width of a component.
 	 */

flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatTextField.java

@@ -18,6 +18,7 @@ package com.formdev.flatlaf.extras.components;
 
 import static com.formdev.flatlaf.FlatClientProperties.*;
 import java.awt.Color;
+import java.awt.Insets;
 import javax.swing.JTextField;
 
 /**
@@ -63,6 +64,27 @@ public class FlatTextField
 	}
 
 
+	/**
+	 * Returns the padding of the text.
+	 *
+	 * @since 1.4
+	 */
+	public Insets getPadding() {
+		return (Insets) getClientProperty( TEXT_FIELD_PADDING );
+	}
+
+	/**
+	 * Specifies the padding of the text.
+	 * This changes the location and size of the text view within the component bounds,
+	 * but does not affect the size of the component.
+	 *
+	 * @since 1.4
+	 */
+	public void setPadding( Insets padding ) {
+		putClientProperty( TEXT_FIELD_PADDING, padding );
+	}
+
+
 	/**
 	 * Returns minimum width of a component.
 	 */

flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt

@@ -1249,6 +1249,7 @@ ToolBar.dockingBackground      #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.dockingForeground      #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.floatingBackground     #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.floatingForeground     #888888    javax.swing.plaf.ColorUIResource [UI]
+ToolBar.focusableButtons       false
 ToolBar.font                   [active] $defaultFont [UI]
 ToolBar.foreground             #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.gripColor              #adadad    javax.swing.plaf.ColorUIResource [UI]

flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt

@@ -1254,6 +1254,7 @@ ToolBar.dockingBackground      #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.dockingForeground      #000000    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.floatingBackground     #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.floatingForeground     #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
+ToolBar.focusableButtons       false
 ToolBar.font                   [active] $defaultFont [UI]
 ToolBar.foreground             #000000    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.gripColor              #afafaf    javax.swing.plaf.ColorUIResource [UI]

flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt

@@ -194,6 +194,7 @@ ComboBox.buttonBackground      #f0f0f0    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonDarkShadow      #696969    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonDisabledArrowColor #ababab    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonEditableBackground #cccccc    javax.swing.plaf.ColorUIResource [UI]
+ComboBox.buttonFocusedBackground #ffff00    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonHighlight       #ffffff    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonHoverArrowColor #ff0000    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonPressedArrowColor #0000ff    javax.swing.plaf.ColorUIResource [UI]
@@ -202,6 +203,7 @@ ComboBox.buttonStyle           auto
 ComboBox.disabledBackground    #e0e0e0    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.disabledForeground    #000088    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.editorColumns         0
+ComboBox.focusedBackground     #ffff88    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.font                  [active] $defaultFont [UI]
 ComboBox.foreground            #ff0000    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.isEnterSelectablePopup false
@@ -209,6 +211,7 @@ ComboBox.maximumRowCount       15
 ComboBox.minimumWidth          72
 ComboBox.noActionOnKeyNavigation false
 ComboBox.padding               2,6,2,6    javax.swing.plaf.InsetsUIResource [UI]
+ComboBox.popupBackground       #ffffcc    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.selectionBackground   #00aa00    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.selectionForeground   #ffff00    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.timeFactor            1000
@@ -265,6 +268,7 @@ EditorPane.border              [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 EditorPane.caretBlinkRate      500
 EditorPane.caretForeground     #0000ff    javax.swing.plaf.ColorUIResource [UI]
 EditorPane.disabledBackground  #e0e0e0    javax.swing.plaf.ColorUIResource [UI]
+EditorPane.focusedBackground   #ffff88    javax.swing.plaf.ColorUIResource [UI]
 EditorPane.font                [active] $defaultFont [UI]
 EditorPane.foreground          #ff0000    javax.swing.plaf.ColorUIResource [UI]
 EditorPane.inactiveBackground  #f0f0f0    javax.swing.plaf.ColorUIResource [UI]
@@ -304,6 +308,7 @@ FormattedTextField.border      [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.F
 FormattedTextField.caretBlinkRate 500
 FormattedTextField.caretForeground #0000ff    javax.swing.plaf.ColorUIResource [UI]
 FormattedTextField.disabledBackground #e0e0e0    javax.swing.plaf.ColorUIResource [UI]
+FormattedTextField.focusedBackground #ffff88    javax.swing.plaf.ColorUIResource [UI]
 FormattedTextField.font        [active] $defaultFont [UI]
 FormattedTextField.foreground  #ff0000    javax.swing.plaf.ColorUIResource [UI]
 FormattedTextField.inactiveBackground #f0f0f0    javax.swing.plaf.ColorUIResource [UI]
@@ -700,6 +705,7 @@ PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #0000ff    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.disabledBackground #e0e0e0    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.echoChar         '\u2022'
+PasswordField.focusedBackground #ffff88    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.font             [active] $defaultFont [UI]
 PasswordField.foreground       #ff0000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.inactiveBackground #f0f0f0    javax.swing.plaf.ColorUIResource [UI]
@@ -935,6 +941,7 @@ Spinner.disabledBackground     #e0e0e0    javax.swing.plaf.ColorUIResource [UI]
 Spinner.disabledForeground     #000088    javax.swing.plaf.ColorUIResource [UI]
 Spinner.editorAlignment        11
 Spinner.editorBorderPainted    false
+Spinner.focusedBackground      #ffff88    javax.swing.plaf.ColorUIResource [UI]
 Spinner.font                   [active] $defaultFont [UI]
 Spinner.foreground             #ff0000    javax.swing.plaf.ColorUIResource [UI]
 Spinner.padding                2,6,2,6    javax.swing.plaf.InsetsUIResource [UI]
@@ -1111,6 +1118,7 @@ TextArea.border                [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 TextArea.caretBlinkRate        500
 TextArea.caretForeground       #0000ff    javax.swing.plaf.ColorUIResource [UI]
 TextArea.disabledBackground    #e0e0e0    javax.swing.plaf.ColorUIResource [UI]
+TextArea.focusedBackground     #ffff88    javax.swing.plaf.ColorUIResource [UI]
 TextArea.font                  [active] $defaultFont [UI]
 TextArea.foreground            #ff0000    javax.swing.plaf.ColorUIResource [UI]
 TextArea.inactiveBackground    #f0f0f0    javax.swing.plaf.ColorUIResource [UI]
@@ -1136,6 +1144,7 @@ TextField.caretBlinkRate       500
 TextField.caretForeground      #0000ff    javax.swing.plaf.ColorUIResource [UI]
 TextField.darkShadow           #696969    javax.swing.plaf.ColorUIResource [UI]
 TextField.disabledBackground   #e0e0e0    javax.swing.plaf.ColorUIResource [UI]
+TextField.focusedBackground    #ffff88    javax.swing.plaf.ColorUIResource [UI]
 TextField.font                 [active] $defaultFont [UI]
 TextField.foreground           #ff0000    javax.swing.plaf.ColorUIResource [UI]
 TextField.highlight            #ffffff    javax.swing.plaf.ColorUIResource [UI]
@@ -1157,6 +1166,7 @@ TextPane.border                [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 TextPane.caretBlinkRate        500
 TextPane.caretForeground       #0000ff    javax.swing.plaf.ColorUIResource [UI]
 TextPane.disabledBackground    #e0e0e0    javax.swing.plaf.ColorUIResource [UI]
+TextPane.focusedBackground     #ffff88    javax.swing.plaf.ColorUIResource [UI]
 TextPane.font                  [active] $defaultFont [UI]
 TextPane.foreground            #ff0000    javax.swing.plaf.ColorUIResource [UI]
 TextPane.inactiveBackground    #f0f0f0    javax.swing.plaf.ColorUIResource [UI]
@@ -1253,6 +1263,7 @@ ToolBar.dockingBackground      #ccffcc    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.dockingForeground      #ff0000    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.floatingBackground     #ccffcc    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.floatingForeground     #000088    javax.swing.plaf.ColorUIResource [UI]
+ToolBar.focusableButtons       true
 ToolBar.font                   [active] $defaultFont [UI]
 ToolBar.foreground             #ff0000    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.gripColor              #afafaf    javax.swing.plaf.ColorUIResource [UI]

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatBaselineTest.java

@@ -51,6 +51,7 @@ public class FlatBaselineTest
 		JFormattedTextField formattedTextField1 = new JFormattedTextField();
 		JPasswordField passwordField1 = new JPasswordField();
 		JComboBox<String> comboBox1 = new JComboBox<>();
+		JComboBox<String> comboBox2 = new JComboBox<>();
 		JSpinner spinner1 = new JSpinner();
 		JLabel label6 = new JLabel();
 		JScrollPane scrollPane1 = new JScrollPane();
@@ -88,7 +89,7 @@ public class FlatBaselineTest
 
 		//======== this ========
 		setLayout(new MigLayout(
-			"insets dialog,hidemode 3,debug",
+			"insets dialog,hidemode 3",
 			// columns
 			"[fill]" +
 			"[fill]" +
@@ -96,6 +97,7 @@ public class FlatBaselineTest
 			"[fill]" +
 			"[fill]" +
 			"[fill]" +
+			"[fill]" +
 			"[fill]",
 			// rows
 			"[]" +
@@ -130,7 +132,7 @@ public class FlatBaselineTest
 
 		//---- textField4 ----
 		textField4.setText("Dext field");
-		add(textField4, "cell 6 0");
+		add(textField4, "cell 7 0");
 
 		//---- label2 ----
 		label2.setText("Dext");
@@ -147,8 +149,20 @@ public class FlatBaselineTest
 		//---- passwordField1 ----
 		passwordField1.setText("Dext");
 		add(passwordField1, "cell 3 1");
+
+		//---- comboBox1 ----
+		comboBox1.setModel(new DefaultComboBoxModel<>(new String[] {
+			"Dext"
+		}));
 		add(comboBox1, "cell 4 1");
-		add(spinner1, "cell 5 1");
+
+		//---- comboBox2 ----
+		comboBox2.setModel(new DefaultComboBoxModel<>(new String[] {
+			"Dext"
+		}));
+		comboBox2.setEditable(true);
+		add(comboBox2, "cell 5 1");
+		add(spinner1, "cell 6 1");
 
 		//---- label6 ----
 		label6.setText("Dext");
@@ -171,7 +185,7 @@ public class FlatBaselineTest
 
 		//---- textField2 ----
 		textField2.setText("Dext field");
-		add(textField2, "cell 6 2");
+		add(textField2, "cell 7 2");
 
 		//---- label7 ----
 		label7.setText("Dext");
@@ -230,18 +244,18 @@ public class FlatBaselineTest
 
 		//---- textField3 ----
 		textField3.setText("Dext field");
-		add(textField3, "cell 6 3");
+		add(textField3, "cell 7 3");
 
 		//---- label3 ----
 		label3.setText("Dext");
 		add(label3, "cell 0 4");
-		add(slider1, "cell 1 4 6 1");
+		add(slider1, "cell 1 4 7 1");
 
 		//---- slider6 ----
 		slider6.setPaintTicks(true);
 		slider6.setMajorTickSpacing(25);
 		slider6.setMinorTickSpacing(5);
-		add(slider6, "cell 1 4 6 1");
+		add(slider6, "cell 1 4 7 1");
 
 		//---- label8 ----
 		label8.setText("Dext");
@@ -251,14 +265,14 @@ public class FlatBaselineTest
 		slider7.setPaintLabels(true);
 		slider7.setMajorTickSpacing(25);
 		slider7.setMinorTickSpacing(5);
-		add(slider7, "cell 1 5 6 1");
+		add(slider7, "cell 1 5 7 1");
 
 		//---- slider8 ----
 		slider8.setPaintLabels(true);
 		slider8.setPaintTicks(true);
 		slider8.setMajorTickSpacing(25);
 		slider8.setMinorTickSpacing(5);
-		add(slider8, "cell 1 5 6 1");
+		add(slider8, "cell 1 5 7 1");
 
 		//---- label4 ----
 		label4.setText("Dext");
@@ -266,13 +280,13 @@ public class FlatBaselineTest
 
 		//---- progressBar1 ----
 		progressBar1.setValue(30);
-		add(progressBar1, "cell 1 6 6 1");
+		add(progressBar1, "cell 1 6 7 1");
 
 		//---- progressBar3 ----
 		progressBar3.setStringPainted(true);
 		progressBar3.setValue(30);
-		add(progressBar3, "cell 1 6 6 1");
+		add(progressBar3, "cell 1 6 7 1");
-		add(separator1, "cell 1 6 6 1");
+		add(separator1, "cell 1 6 7 1");
 
 		//---- label5 ----
 		label5.setText("Dext");
@@ -280,26 +294,26 @@ public class FlatBaselineTest
 
 		//---- slider2 ----
 		slider2.setOrientation(SwingConstants.VERTICAL);
-		add(slider2, "cell 1 7 6 1");
+		add(slider2, "cell 1 7 7 1");
 
 		//---- slider3 ----
 		slider3.setOrientation(SwingConstants.VERTICAL);
 		slider3.setPaintTicks(true);
 		slider3.setMajorTickSpacing(25);
 		slider3.setMinorTickSpacing(5);
-		add(slider3, "cell 1 7 6 1");
+		add(slider3, "cell 1 7 7 1");
 
 		//---- progressBar2 ----
 		progressBar2.setOrientation(SwingConstants.VERTICAL);
 		progressBar2.setValue(30);
-		add(progressBar2, "cell 1 7 6 1");
+		add(progressBar2, "cell 1 7 7 1");
 
 		//---- progressBar4 ----
 		progressBar4.setOrientation(SwingConstants.VERTICAL);
 		progressBar4.setStringPainted(true);
 		progressBar4.setValue(30);
-		add(progressBar4, "cell 1 7 6 1");
+		add(progressBar4, "cell 1 7 7 1");
-		add(hSpacer1, "cell 1 7 6 1,growx");
+		add(hSpacer1, "cell 1 7 7 1,growx");
 
 		//---- label9 ----
 		label9.setText("Dext");
@@ -310,7 +324,7 @@ public class FlatBaselineTest
 		slider4.setPaintLabels(true);
 		slider4.setMajorTickSpacing(25);
 		slider4.setMinorTickSpacing(5);
-		add(slider4, "cell 1 8 6 1");
+		add(slider4, "cell 1 8 7 1");
 
 		//---- slider5 ----
 		slider5.setOrientation(SwingConstants.VERTICAL);
@@ -318,8 +332,8 @@ public class FlatBaselineTest
 		slider5.setPaintTicks(true);
 		slider5.setMajorTickSpacing(25);
 		slider5.setMinorTickSpacing(5);
-		add(slider5, "cell 1 8 6 1");
+		add(slider5, "cell 1 8 7 1");
-		add(hSpacer2, "cell 1 8 6 1,growx");
+		add(hSpacer2, "cell 1 8 7 1,growx");
 		// JFormDesigner - End of component initialization  //GEN-END:initComponents
 	}
 

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatBaselineTest.jfd

@@ -1,4 +1,4 @@
-JFDML JFormDesigner: "7.0.2.0.298" Java: "15" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.4.0.360" Java: "16" encoding: "UTF-8"
 
 new FormModel {
 	contentType: "form/swing"
@@ -7,8 +7,8 @@ new FormModel {
 			"JavaCodeGenerator.defaultVariableLocal": true
 		}
 		add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
-			"$layoutConstraints": "insets dialog,hidemode 3,debug"
+			"$layoutConstraints": "insets dialog,hidemode 3"
-			"$columnConstraints": "[fill][fill][fill][fill][fill][fill][fill]"
+			"$columnConstraints": "[fill][fill][fill][fill][fill][fill][fill][fill]"
 			"$rowConstraints": "[][][50][::80][][][][][]"
 		} ) {
 			name: "this"
@@ -46,7 +46,7 @@ new FormModel {
 				name: "textField4"
 				"text": "Dext field"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 6 0"
+				"value": "cell 7 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label2"
@@ -74,16 +74,33 @@ new FormModel {
 			} )
 			add( new FormComponent( "javax.swing.JComboBox" ) {
 				name: "comboBox1"
+				"model": new javax.swing.DefaultComboBoxModel {
+					selectedItem: "Dext"
+					addElement( "Dext" )
+				}
 				auxiliary() {
 					"JavaCodeGenerator.typeParameters": "String"
 				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 4 1"
 			} )
+			add( new FormComponent( "javax.swing.JComboBox" ) {
+				name: "comboBox2"
+				"model": new javax.swing.DefaultComboBoxModel {
+					selectedItem: "Dext"
+					addElement( "Dext" )
+				}
+				"editable": true
+				auxiliary() {
+					"JavaCodeGenerator.typeParameters": "String"
+				}
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 5 1"
+			} )
 			add( new FormComponent( "javax.swing.JSpinner" ) {
 				name: "spinner1"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 5 1"
+				"value": "cell 6 1"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label6"
@@ -112,7 +129,7 @@ new FormModel {
 				name: "textField2"
 				"text": "Dext field"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 6 2"
+				"value": "cell 7 2"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label7"
@@ -184,7 +201,7 @@ new FormModel {
 				name: "textField3"
 				"text": "Dext field"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 6 3"
+				"value": "cell 7 3"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label3"
@@ -195,7 +212,7 @@ new FormModel {
 			add( new FormComponent( "javax.swing.JSlider" ) {
 				name: "slider1"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 4 6 1"
+				"value": "cell 1 4 7 1"
 			} )
 			add( new FormComponent( "javax.swing.JSlider" ) {
 				name: "slider6"
@@ -203,7 +220,7 @@ new FormModel {
 				"majorTickSpacing": 25
 				"minorTickSpacing": 5
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 4 6 1"
+				"value": "cell 1 4 7 1"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label8"
@@ -217,7 +234,7 @@ new FormModel {
 				"majorTickSpacing": 25
 				"minorTickSpacing": 5
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 5 6 1"
+				"value": "cell 1 5 7 1"
 			} )
 			add( new FormComponent( "javax.swing.JSlider" ) {
 				name: "slider8"
@@ -226,7 +243,7 @@ new FormModel {
 				"majorTickSpacing": 25
 				"minorTickSpacing": 5
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 5 6 1"
+				"value": "cell 1 5 7 1"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label4"
@@ -238,19 +255,19 @@ new FormModel {
 				name: "progressBar1"
 				"value": 30
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 6 6 1"
+				"value": "cell 1 6 7 1"
 			} )
 			add( new FormComponent( "javax.swing.JProgressBar" ) {
 				name: "progressBar3"
 				"stringPainted": true
 				"value": 30
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 6 6 1"
+				"value": "cell 1 6 7 1"
 			} )
 			add( new FormComponent( "javax.swing.JSeparator" ) {
 				name: "separator1"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 6 6 1"
+				"value": "cell 1 6 7 1"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label5"
@@ -262,7 +279,7 @@ new FormModel {
 				name: "slider2"
 				"orientation": 1
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 7 6 1"
+				"value": "cell 1 7 7 1"
 			} )
 			add( new FormComponent( "javax.swing.JSlider" ) {
 				name: "slider3"
@@ -271,14 +288,14 @@ new FormModel {
 				"majorTickSpacing": 25
 				"minorTickSpacing": 5
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 7 6 1"
+				"value": "cell 1 7 7 1"
 			} )
 			add( new FormComponent( "javax.swing.JProgressBar" ) {
 				name: "progressBar2"
 				"orientation": 1
 				"value": 30
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 7 6 1"
+				"value": "cell 1 7 7 1"
 			} )
 			add( new FormComponent( "javax.swing.JProgressBar" ) {
 				name: "progressBar4"
@@ -286,12 +303,12 @@ new FormModel {
 				"stringPainted": true
 				"value": 30
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 7 6 1"
+				"value": "cell 1 7 7 1"
 			} )
 			add( new FormComponent( "com.jformdesigner.designer.wrapper.HSpacer" ) {
 				name: "hSpacer1"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 7 6 1,growx"
+				"value": "cell 1 7 7 1,growx"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label9"
@@ -306,7 +323,7 @@ new FormModel {
 				"majorTickSpacing": 25
 				"minorTickSpacing": 5
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 8 6 1"
+				"value": "cell 1 8 7 1"
 			} )
 			add( new FormComponent( "javax.swing.JSlider" ) {
 				name: "slider5"
@@ -316,12 +333,12 @@ new FormModel {
 				"majorTickSpacing": 25
 				"minorTickSpacing": 5
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 8 6 1"
+				"value": "cell 1 8 7 1"
 			} )
 			add( new FormComponent( "com.jformdesigner.designer.wrapper.HSpacer" ) {
 				name: "hSpacer2"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 8 6 1,growx"
+				"value": "cell 1 8 7 1,growx"
 			} )
 		}, new FormLayoutConstraints( null ) {
 			"location": new java.awt.Point( 0, 0 )

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatCustomBordersTest.java

@@ -20,6 +20,7 @@ import java.awt.*;
 import javax.swing.*;
 import javax.swing.border.*;
 import javax.swing.plaf.basic.BasicComboBoxEditor;
+import javax.swing.plaf.basic.BasicComboBoxRenderer;
 import com.formdev.flatlaf.icons.FlatFileViewFloppyDriveIcon;
 import com.formdev.flatlaf.util.UIScale;
 import net.miginfocom.swing.*;
@@ -42,9 +43,24 @@ public class FlatCustomBordersTest
 		} );
 	}
 
+	@SuppressWarnings( "unchecked" )
 	FlatCustomBordersTest() {
 		initComponents();
 		applyCustomBorders();
+		applySpecialComboBoxRenderers();
+
+		DefaultComboBoxModel<String> model = new DefaultComboBoxModel<>( new String[] {
+			"text",
+			"123",
+			"4567",
+			"abc",
+			"def"
+		} );
+
+		for( Component c : getComponents() ) {
+			if( c instanceof JComboBox )
+				((JComboBox<String>)c).setModel( model );
+		}
 	}
 
 	@Override
@@ -99,6 +115,40 @@ public class FlatCustomBordersTest
 		applyCustomComboBoxEditorBorderWithIcon( comboBox20 );
 		applyCustomComboBoxEditorBorder( comboBox21, null );
 		applyCustomComboBoxEditorBorder( comboBox22, null );
+
+		applyCustomComboBoxRendererBorder( comboBox23 );
+		applyCustomComboBoxRendererBorder( comboBox24 );
+		applyCustomComboBoxRendererBorderWithIcon( comboBox25 );
+		applyCustomComboBoxRendererBorderWithIcon( comboBox26 );
+		applyCustomComboBoxRendererBorder( comboBox27, null );
+		applyCustomComboBoxRendererBorder( comboBox28, null );
+	}
+
+	@SuppressWarnings( "unchecked" )
+	private void applySpecialComboBoxRenderers() {
+		BasicComboBoxRenderer sharedRenderer = new BasicComboBoxRenderer();
+		sharedRenderer.setBorder( new LineBorder( ORANGE, UIScale.scale( 2 ) ) );
+		comboBox29.setRenderer( sharedRenderer );
+		comboBox30.setRenderer( sharedRenderer );
+
+		comboBox31.setRenderer( new ListCellRenderer<String>() {
+			JLabel l1 = new JLabel();
+			JLabel l2 = new JLabel();
+
+			@Override
+			public Component getListCellRendererComponent( JList<? extends String> list,
+				String value, int index, boolean isSelected, boolean cellHasFocus )
+			{
+				JLabel l = (index % 2 == 0) ? l1 : l2;
+				l.setText( (value != null) ? value.toString() : "" );
+				l.setBorder( new LineBorder( (index % 2 == 0) ? GREEN : RED, UIScale.scale( 2 ) ) );
+				l.setBackground( isSelected ? list.getSelectionBackground() : list.getBackground() );
+				l.setForeground( isSelected ? list.getSelectionForeground() : list.getForeground() );
+				l.setFont( list.getFont() );
+				l.setOpaque( true );
+				return l;
+			}
+		} );
 	}
 
 	private void applyCustomInsideBorder( JComponent c, String uiKey ) {
@@ -110,7 +160,7 @@ public class FlatCustomBordersTest
 	}
 
 	private void applyCustomComboBoxEditorBorder( JComboBox<String> comboBox ) {
-		applyCustomComboBoxEditorBorder( comboBox, new LineBorder( ORANGE, UIScale.scale( 3 ) ) );
+		applyCustomComboBoxEditorBorder( comboBox, new LineBorder( ORANGE, UIScale.scale( 6 ) ) );
 	}
 
 	private void applyCustomComboBoxEditorBorderWithIcon( JComboBox<String> comboBox ) {
@@ -129,6 +179,21 @@ public class FlatCustomBordersTest
 		} );
 	}
 
+	private void applyCustomComboBoxRendererBorder( JComboBox<String> comboBox ) {
+		applyCustomComboBoxRendererBorder( comboBox, new LineBorder( ORANGE, UIScale.scale( 6 ) ) );
+	}
+
+	private void applyCustomComboBoxRendererBorderWithIcon( JComboBox<String> comboBox ) {
+		applyCustomComboBoxRendererBorder( comboBox, new BorderWithIcon() );
+	}
+
+	@SuppressWarnings( "unchecked" )
+	private void applyCustomComboBoxRendererBorder( JComboBox<String> comboBox, Border border ) {
+		BasicComboBoxRenderer customRenderer = new BasicComboBoxRenderer();
+		customRenderer.setBorder( border );
+		comboBox.setRenderer( customRenderer );
+	}
+
 	private void initComponents() {
 		// JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
 		label1 = new JLabel();
@@ -152,10 +217,16 @@ public class FlatCustomBordersTest
 		comboBox2 = new JComboBox<>();
 		comboBox3 = new JComboBox<>();
 		comboBox4 = new JComboBox<>();
+		comboBox23 = new JComboBox<>();
+		comboBox25 = new JComboBox<>();
+		comboBox27 = new JComboBox<>();
 		comboBox5 = new JComboBox<>();
 		comboBox6 = new JComboBox<>();
 		comboBox7 = new JComboBox<>();
 		comboBox8 = new JComboBox<>();
+		comboBox24 = new JComboBox<>();
+		comboBox26 = new JComboBox<>();
+		comboBox28 = new JComboBox<>();
 		comboBox9 = new JComboBox<>();
 		comboBox10 = new JComboBox<>();
 		comboBox11 = new JComboBox<>();
@@ -188,6 +259,11 @@ public class FlatCustomBordersTest
 		textField6 = new JTextField();
 		textField7 = new JTextField();
 		textField8 = new JTextField();
+		label11 = new JLabel();
+		label12 = new JLabel();
+		comboBox29 = new JComboBox<>();
+		comboBox30 = new JComboBox<>();
+		comboBox31 = new JComboBox<>();
 
 		//======== this ========
 		setLayout(new MigLayout(
@@ -212,6 +288,8 @@ public class FlatCustomBordersTest
 			"[]" +
 			"[]" +
 			"[]" +
+			"[]para" +
+			"[]" +
 			"[]"));
 
 		//---- label1 ----
@@ -289,6 +367,9 @@ public class FlatCustomBordersTest
 		add(comboBox2, "cell 2 3");
 		add(comboBox3, "cell 3 3");
 		add(comboBox4, "cell 4 3");
+		add(comboBox23, "cell 5 3");
+		add(comboBox25, "cell 6 3");
+		add(comboBox27, "cell 7 3");
 
 		//---- comboBox5 ----
 		comboBox5.putClientProperty("JComponent.roundRect", true);
@@ -306,6 +387,18 @@ public class FlatCustomBordersTest
 		comboBox8.putClientProperty("JComponent.roundRect", true);
 		add(comboBox8, "cell 4 4");
 
+		//---- comboBox24 ----
+		comboBox24.putClientProperty("JComponent.roundRect", true);
+		add(comboBox24, "cell 5 4");
+
+		//---- comboBox26 ----
+		comboBox26.putClientProperty("JComponent.roundRect", true);
+		add(comboBox26, "cell 6 4");
+
+		//---- comboBox28 ----
+		comboBox28.putClientProperty("JComponent.roundRect", true);
+		add(comboBox28, "cell 7 4");
+
 		//---- comboBox9 ----
 		comboBox9.setEditable(true);
 		add(comboBox9, "cell 1 5");
@@ -435,6 +528,17 @@ public class FlatCustomBordersTest
 		textField8.putClientProperty("JComponent.roundRect", true);
 		textField8.setText("text");
 		add(textField8, "cell 4 10");
+
+		//---- label11 ----
+		label11.setText("JComboBox with shared renderer:");
+		add(label11, "cell 1 11 2 1");
+
+		//---- label12 ----
+		label12.setText("JComboBox with renderer that uses varying components:");
+		add(label12, "cell 3 11 3 1");
+		add(comboBox29, "cell 1 12");
+		add(comboBox30, "cell 2 12");
+		add(comboBox31, "cell 3 12");
 		// JFormDesigner - End of component initialization  //GEN-END:initComponents
 	}
 
@@ -460,10 +564,16 @@ public class FlatCustomBordersTest
 	private JComboBox<String> comboBox2;
 	private JComboBox<String> comboBox3;
 	private JComboBox<String> comboBox4;
+	private JComboBox<String> comboBox23;
+	private JComboBox<String> comboBox25;
+	private JComboBox<String> comboBox27;
 	private JComboBox<String> comboBox5;
 	private JComboBox<String> comboBox6;
 	private JComboBox<String> comboBox7;
 	private JComboBox<String> comboBox8;
+	private JComboBox<String> comboBox24;
+	private JComboBox<String> comboBox26;
+	private JComboBox<String> comboBox28;
 	private JComboBox<String> comboBox9;
 	private JComboBox<String> comboBox10;
 	private JComboBox<String> comboBox11;
@@ -496,6 +606,11 @@ public class FlatCustomBordersTest
 	private JTextField textField6;
 	private JTextField textField7;
 	private JTextField textField8;
+	private JLabel label11;
+	private JLabel label12;
+	private JComboBox<String> comboBox29;
+	private JComboBox<String> comboBox30;
+	private JComboBox<String> comboBox31;
 	// JFormDesigner - End of variables declaration  //GEN-END:variables
 
 	//---- class BorderWithIcon -----------------------------------------------
@@ -508,6 +623,9 @@ public class FlatCustomBordersTest
 		@Override
 		public void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
 			icon.paintIcon( c, g, x + width - icon.getIconWidth() - 2, y + ((height - icon.getIconHeight()) / 2) );
+
+			g.setColor( RED );
+			g.drawRect( x, y, width - 1, height - 1 );
 		}
 
 		@Override

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatCustomBordersTest.jfd

@@ -1,4 +1,4 @@
-JFDML JFormDesigner: "7.0.2.0.298" Java: "15" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.4.0.360" Java: "16" encoding: "UTF-8"
 
 new FormModel {
 	contentType: "form/swing"
@@ -6,7 +6,7 @@ new FormModel {
 		add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
 			"$layoutConstraints": "ltr,insets dialog,hidemode 3"
 			"$columnConstraints": "[][fill][fill][fill][fill][fill][fill][fill]"
-			"$rowConstraints": "[][][][][][][][][][][]"
+			"$rowConstraints": "[][][][][][][][][][][]para[][]"
 		} ) {
 			name: "this"
 			add( new FormComponent( "javax.swing.JLabel" ) {
@@ -147,6 +147,30 @@ new FormModel {
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 4 3"
 			} )
+			add( new FormComponent( "javax.swing.JComboBox" ) {
+				name: "comboBox23"
+				auxiliary() {
+					"JavaCodeGenerator.typeParameters": "String"
+				}
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 5 3"
+			} )
+			add( new FormComponent( "javax.swing.JComboBox" ) {
+				name: "comboBox25"
+				auxiliary() {
+					"JavaCodeGenerator.typeParameters": "String"
+				}
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 6 3"
+			} )
+			add( new FormComponent( "javax.swing.JComboBox" ) {
+				name: "comboBox27"
+				auxiliary() {
+					"JavaCodeGenerator.typeParameters": "String"
+				}
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 7 3"
+			} )
 			add( new FormComponent( "javax.swing.JComboBox" ) {
 				name: "comboBox5"
 				"$client.JComponent.roundRect": true
@@ -183,6 +207,33 @@ new FormModel {
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 4 4"
 			} )
+			add( new FormComponent( "javax.swing.JComboBox" ) {
+				name: "comboBox24"
+				"$client.JComponent.roundRect": true
+				auxiliary() {
+					"JavaCodeGenerator.typeParameters": "String"
+				}
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 5 4"
+			} )
+			add( new FormComponent( "javax.swing.JComboBox" ) {
+				name: "comboBox26"
+				"$client.JComponent.roundRect": true
+				auxiliary() {
+					"JavaCodeGenerator.typeParameters": "String"
+				}
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 6 4"
+			} )
+			add( new FormComponent( "javax.swing.JComboBox" ) {
+				name: "comboBox28"
+				"$client.JComponent.roundRect": true
+				auxiliary() {
+					"JavaCodeGenerator.typeParameters": "String"
+				}
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 7 4"
+			} )
 			add( new FormComponent( "javax.swing.JComboBox" ) {
 				name: "comboBox9"
 				"editable": true
@@ -427,6 +478,42 @@ new FormModel {
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 4 10"
 			} )
+			add( new FormComponent( "javax.swing.JLabel" ) {
+				name: "label11"
+				"text": "JComboBox with shared renderer:"
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 1 11 2 1"
+			} )
+			add( new FormComponent( "javax.swing.JLabel" ) {
+				name: "label12"
+				"text": "JComboBox with renderer that uses varying components:"
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 3 11 3 1"
+			} )
+			add( new FormComponent( "javax.swing.JComboBox" ) {
+				name: "comboBox29"
+				auxiliary() {
+					"JavaCodeGenerator.typeParameters": "String"
+				}
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 1 12"
+			} )
+			add( new FormComponent( "javax.swing.JComboBox" ) {
+				name: "comboBox30"
+				auxiliary() {
+					"JavaCodeGenerator.typeParameters": "String"
+				}
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 2 12"
+			} )
+			add( new FormComponent( "javax.swing.JComboBox" ) {
+				name: "comboBox31"
+				auxiliary() {
+					"JavaCodeGenerator.typeParameters": "String"
+				}
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 3 12"
+			} )
 		}, new FormLayoutConstraints( null ) {
 			"location": new java.awt.Point( 0, 0 )
 			"size": new java.awt.Dimension( 915, 715 )

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.java

@@ -89,6 +89,10 @@ public class FlatOptionPaneTest
 		JPanel panel6 = new JPanel();
 		customOptionPane = new JOptionPane();
 		FlatOptionPaneTest.ShowDialogLinkLabel customShowDialogLabel = new FlatOptionPaneTest.ShowDialogLinkLabel();
+		JLabel rightToLeftLabel = new JLabel();
+		JPanel panel10 = new JPanel();
+		JOptionPane rightToLeftOptionPane = new JOptionPane();
+		rightToLeftShowDialogLabel = new FlatOptionPaneTest.ShowDialogLinkLabel();
 
 		//======== this ========
 		setBorder(BorderFactory.createEmptyBorder());
@@ -109,6 +113,7 @@ public class FlatOptionPaneTest
 				"[top]" +
 				"[top]" +
 				"[top]" +
+				"[top]" +
 				"[top]"));
 
 			//---- plainLabel ----
@@ -283,6 +288,28 @@ public class FlatOptionPaneTest
 			customShowDialogLabel.setOptionPane(customOptionPane);
 			customShowDialogLabel.setTitleLabel(customLabel);
 			panel9.add(customShowDialogLabel, "cell 2 7");
+
+			//---- rightToLeftLabel ----
+			rightToLeftLabel.setText("Right-to-left:");
+			panel9.add(rightToLeftLabel, "cell 0 8");
+
+			//======== panel10 ========
+			{
+				panel10.setBorder(LineBorder.createGrayLineBorder());
+				panel10.setLayout(new BorderLayout());
+
+				//---- rightToLeftOptionPane ----
+				rightToLeftOptionPane.setMessageType(JOptionPane.INFORMATION_MESSAGE);
+				rightToLeftOptionPane.setMessage("\u0627\u0644\u0645\u0627\u062f\u0629 1 \u064a\u0648\u0644\u062f \u062c\u0645\u064a\u0639 \u0627\u0644\u0646\u0627\u0633 \u0623\u062d\u0631\u0627\u0631\u064b\u0627 \u0645\u062a\u0633\u0627\u0648\u064a\u0646 \u0641\u064a \u0627\u0644\u0643\u0631\u0627\u0645\u0629 \u0648\u0627\u0644\u062d\u0642\u0648\u0642. \u0648\u0642\u062f \u0648\u0647\u0628\u0648\u0627 \u0639\u0642\u0644\u0627\u064b \u0648\u0636\u0645\u064a\u0631\u064b\u0627 \u0648\u0639\u0644\u064a\u0647\u0645 \u0623\u0646 \u064a\u0639\u0627\u0645\u0644 \u0628\u0639\u0636\u0647\u0645 \u0628\u0639\u0636\u064b\u0627 \u0628\u0631\u0648\u062d \u0627\u0644\u0625\u062e\u0627\u0621.\n\u0627\u0644\u0645\u0627\u062f\u0629 1 \u064a\u0648\u0644\u062f \u062c\u0645\u064a\u0639 \u0627\u0644\u0646\u0627\u0633 \u0623\u062d\u0631\u0627\u0631\u064b\u0627 \u0645\u062a\u0633\u0627\u0648\u064a\u0646 \u0641\u064a \u0627\u0644\u0643\u0631\u0627\u0645\u0629 \u0648\u0627\u0644\u062d\u0642\u0648\u0642. \u0648\u0642\u062f \u0648\u0647\u0628\u0648\u0627 \u0639\u0642\u0644\u0627\u064b \u0648\u0636\u0645\u064a\u0631\u064b\u0627 \u0648\u0639\u0644\u064a\u0647\u0645 \u0623\u0646 \u064a\u0639\u0627\u0645\u0644 \u0628\u0639\u0636\u0647\u0645 \u0628\u0639\u0636\u064b\u0627 \u0628\u0631\u0648\u062d \u0627\u0644\u0625\u062e\u0627\u0621.\n\n\u0627\u0644\u0645\u0627\u062f\u0629 1 \u064a\u0648\u0644\u062f \u062c\u0645\u064a\u0639 \u0627\u0644\u0646\u0627\u0633 \u0623\u062d\u0631\u0627\u0631\u064b\u0627 \u0645\u062a\u0633\u0627\u0648\u064a\u0646 \u0641\u064a \u0627\u0644\u0643\u0631\u0627\u0645\u0629 \n\u0648\u0627\u0644\u062d\u0642\u0648\u0642. \u0648\u0642\u062f \u0648\u0647\u0628\u0648\u0627 \u0639\u0642\u0644\u0627\u064b \u0648\u0636\u0645\u064a\u0631\u064b\u0627 \u0648\u0639\u0644\u064a\u0647\u0645 \u0623\u0646 \u064a\u0639\u0627\u0645\u0644 \u0628\u0639\u0636\u0647\u0645 \u0628\u0639\u0636\u064b\u0627 \u0628\u0631\u0648\u062d \u0627\u0644\u0625\u062e\u0627\u0621.");
+				rightToLeftOptionPane.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
+				panel10.add(rightToLeftOptionPane, BorderLayout.CENTER);
+			}
+			panel9.add(panel10, "cell 1 8");
+
+			//---- rightToLeftShowDialogLabel ----
+			rightToLeftShowDialogLabel.setOptionPane(rightToLeftOptionPane);
+			rightToLeftShowDialogLabel.setTitleLabel(rightToLeftLabel);
+			panel9.add(rightToLeftShowDialogLabel, "cell 2 8");
 		}
 		setViewportView(panel9);
 		// JFormDesigner - End of component initialization  //GEN-END:initComponents
@@ -293,6 +320,7 @@ public class FlatOptionPaneTest
 	private FlatOptionPaneTest.ShowDialogLinkLabel errorShowDialogLabel;
 	private FlatOptionPaneTest.ShowDialogLinkLabel informationShowDialogLabel;
 	private JOptionPane customOptionPane;
+	private FlatOptionPaneTest.ShowDialogLinkLabel rightToLeftShowDialogLabel;
 	// JFormDesigner - End of variables declaration  //GEN-END:variables
 
 	//---- class ShowDialogLinkLabel ------------------------------------------
@@ -315,9 +343,15 @@ public class FlatOptionPaneTest
 		}
 
 		private void showDialog() {
+			Component parent = SwingUtilities.windowForComponent( this );
+
+			// use optionPane as parent if component orientation is different
+			if( parent.getComponentOrientation().isLeftToRight() != optionPane.getComponentOrientation().isLeftToRight() )
+				parent = optionPane;
+
 			if( optionPane.getWantsInput() ) {
 				JOptionPane.showInputDialog(
-					getParent(),
+					parent,
 					optionPane.getMessage(),
 					titleLabel.getText() + " Title",
 					optionPane.getMessageType(),
@@ -326,7 +360,7 @@ public class FlatOptionPaneTest
 					null );
 			} else {
 				JOptionPane.showOptionDialog(
-					getParent(),
+					parent,
 					optionPane.getMessage(),
 					titleLabel.getText() + " Title",
 					optionPane.getOptionType(),

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.jfd

@@ -1,4 +1,4 @@
-JFDML JFormDesigner: "7.0.1.0.272" Java: "13.0.2" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.4.0.360" Java: "16" encoding: "UTF-8"
 
 new FormModel {
 	contentType: "form/swing"
@@ -12,7 +12,7 @@ new FormModel {
 			add( new FormContainer( "com.formdev.flatlaf.demo.ScrollablePanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
 				"$layoutConstraints": "flowy,ltr,insets dialog,hidemode 3"
 				"$columnConstraints": "[][][fill]"
-				"$rowConstraints": "[top][top][top][top][top][top][top][top]"
+				"$rowConstraints": "[top][top][top][top][top][top][top][top][top]"
 			} ) {
 				name: "panel9"
 				add( new FormComponent( "javax.swing.JLabel" ) {
@@ -240,10 +240,40 @@ new FormModel {
 				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 					"value": "cell 2 7"
 				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "rightToLeftLabel"
+					"text": "Right-to-left:"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 8"
+				} )
+				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+					name: "panel10"
+					"border": #LineBorder0
+					add( new FormComponent( "javax.swing.JOptionPane" ) {
+						name: "rightToLeftOptionPane"
+						"messageType": 1
+						"message": "المادة 1 يولد جميع الناس أحرارًا متساوين في الكرامة والحقوق. وقد وهبوا عقلاً وضميرًا وعليهم أن يعامل بعضهم بعضًا بروح الإخاء.\nالمادة 1 يولد جميع الناس أحرارًا متساوين في الكرامة والحقوق. وقد وهبوا عقلاً وضميرًا وعليهم أن يعامل بعضهم بعضًا بروح الإخاء.\n\nالمادة 1 يولد جميع الناس أحرارًا متساوين في الكرامة \nوالحقوق. وقد وهبوا عقلاً وضميرًا وعليهم أن يعامل بعضهم بعضًا بروح الإخاء."
+						"componentOrientation": sfield java.awt.ComponentOrientation RIGHT_TO_LEFT
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "Center"
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 8"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
+					name: "rightToLeftShowDialogLabel"
+					"optionPane": new FormReference( "rightToLeftOptionPane" )
+					"titleLabel": new FormReference( "rightToLeftLabel" )
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 8"
+				} )
 			} )
 		}, new FormLayoutConstraints( null ) {
 			"location": new java.awt.Point( 0, 0 )
-			"size": new java.awt.Dimension( 840, 900 )
+			"size": new java.awt.Dimension( 895, 1080 )
 		} )
 	}
 }

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTextComponentsTest.java

@@ -16,8 +16,12 @@
 
 package com.formdev.flatlaf.testing;
 
+import java.awt.Component;
+import java.awt.Insets;
 import javax.swing.*;
+import javax.swing.border.*;
 import javax.swing.text.DefaultEditorKit;
+import com.formdev.flatlaf.FlatClientProperties;
 import net.miginfocom.swing.*;
 
 /**
@@ -41,16 +45,40 @@ public class FlatTextComponentsTest
 		textField1.setText( "new text" );
 	}
 
+	private void paddingChanged() {
+		Insets padding = new Insets(
+			(int) topPaddingField.getValue(),
+			(int) leftPaddingField.getValue(),
+			(int) bottomPaddingField.getValue(),
+			(int) rightPaddingField.getValue() );
+		if( padding.equals( new Insets( 0, 0, 0, 0 ) ) )
+			padding = null;
+
+		for( Component c : getComponents() ) {
+			if( c instanceof JTextField )
+				((JTextField)c).putClientProperty( FlatClientProperties.TEXT_FIELD_PADDING, padding );
+		}
+	}
+
 	private void initComponents() {
 		// JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
 		JLabel textFieldLabel = new JLabel();
 		textField1 = new JTextField();
 		JTextField textField3 = new JTextField();
 		JTextField textField2 = new JTextField();
-		JButton button1 = new JButton();
 		JLabel formattedTextFieldLabel = new JLabel();
 		JFormattedTextField formattedTextField1 = new JFormattedTextField();
 		JFormattedTextField formattedTextField3 = new JFormattedTextField();
+		JPanel panel1 = new JPanel();
+		JButton button1 = new JButton();
+		JLabel leftPaddingLabel = new JLabel();
+		leftPaddingField = new JSpinner();
+		JLabel rightPaddingLabel = new JLabel();
+		rightPaddingField = new JSpinner();
+		JLabel topPaddingLabel = new JLabel();
+		topPaddingField = new JSpinner();
+		JLabel bottomPaddingLabel = new JLabel();
+		bottomPaddingField = new JSpinner();
 		JLabel passwordFieldLabel = new JLabel();
 		JPasswordField passwordField1 = new JPasswordField();
 		JPasswordField passwordField3 = new JPasswordField();
@@ -134,12 +162,6 @@ public class FlatTextComponentsTest
 		textField2.setName("textField2");
 		add(textField2, "cell 3 0");
 
-		//---- button1 ----
-		button1.setText("change text");
-		button1.setName("button1");
-		button1.addActionListener(e -> changeText());
-		add(button1, "cell 4 0");
-
 		//---- formattedTextFieldLabel ----
 		formattedTextFieldLabel.setText("JFormattedTextField:");
 		formattedTextFieldLabel.setDisplayedMnemonic('F');
@@ -159,6 +181,70 @@ public class FlatTextComponentsTest
 		formattedTextField3.setName("formattedTextField3");
 		add(formattedTextField3, "cell 2 1,growx");
 
+		//======== panel1 ========
+		{
+			panel1.setBorder(new TitledBorder("Control"));
+			panel1.setName("panel1");
+			panel1.setLayout(new MigLayout(
+				"hidemode 3",
+				// columns
+				"[fill]" +
+				"[fill]",
+				// rows
+				"[]" +
+				"[]" +
+				"[]" +
+				"[]" +
+				"[]"));
+
+			//---- button1 ----
+			button1.setText("change text");
+			button1.setName("button1");
+			button1.addActionListener(e -> changeText());
+			panel1.add(button1, "cell 0 0 2 1,alignx left,growx 0");
+
+			//---- leftPaddingLabel ----
+			leftPaddingLabel.setText("Left padding:");
+			leftPaddingLabel.setName("leftPaddingLabel");
+			panel1.add(leftPaddingLabel, "cell 0 1");
+
+			//---- leftPaddingField ----
+			leftPaddingField.setName("leftPaddingField");
+			leftPaddingField.addChangeListener(e -> paddingChanged());
+			panel1.add(leftPaddingField, "cell 1 1");
+
+			//---- rightPaddingLabel ----
+			rightPaddingLabel.setText("Right padding:");
+			rightPaddingLabel.setName("rightPaddingLabel");
+			panel1.add(rightPaddingLabel, "cell 0 2");
+
+			//---- rightPaddingField ----
+			rightPaddingField.setName("rightPaddingField");
+			rightPaddingField.addChangeListener(e -> paddingChanged());
+			panel1.add(rightPaddingField, "cell 1 2");
+
+			//---- topPaddingLabel ----
+			topPaddingLabel.setText("Top padding:");
+			topPaddingLabel.setName("topPaddingLabel");
+			panel1.add(topPaddingLabel, "cell 0 3");
+
+			//---- topPaddingField ----
+			topPaddingField.setName("topPaddingField");
+			topPaddingField.addChangeListener(e -> paddingChanged());
+			panel1.add(topPaddingField, "cell 1 3");
+
+			//---- bottomPaddingLabel ----
+			bottomPaddingLabel.setText("Bottom padding:");
+			bottomPaddingLabel.setName("bottomPaddingLabel");
+			panel1.add(bottomPaddingLabel, "cell 0 4");
+
+			//---- bottomPaddingField ----
+			bottomPaddingField.setName("bottomPaddingField");
+			bottomPaddingField.addChangeListener(e -> paddingChanged());
+			panel1.add(bottomPaddingField, "cell 1 4");
+		}
+		add(panel1, "cell 4 0 1 6,aligny top,growy 0");
+
 		//---- passwordFieldLabel ----
 		passwordFieldLabel.setText("JPasswordField:");
 		passwordFieldLabel.setDisplayedMnemonic('P');
@@ -301,7 +387,7 @@ public class FlatTextComponentsTest
 		comboBox3.setPrototypeDisplayValue("12345");
 		comboBox3.setComponentPopupMenu(popupMenu1);
 		comboBox3.setName("comboBox3");
-		add(comboBox3, "cell 2 6,growx");
+		add(comboBox3, "cell 2 6,growx,wmin 50");
 
 		//---- spinnerLabel ----
 		spinnerLabel.setText("JSpinner:");
@@ -361,5 +447,9 @@ public class FlatTextComponentsTest
 
 	// JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
 	private JTextField textField1;
+	private JSpinner leftPaddingField;
+	private JSpinner rightPaddingField;
+	private JSpinner topPaddingField;
+	private JSpinner bottomPaddingField;
 	// JFormDesigner - End of variables declaration  //GEN-END:variables
 }

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTextComponentsTest.jfd

@@ -1,4 +1,4 @@
-JFDML JFormDesigner: "7.0.3.1.342" Java: "16" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.4.0.360" Java: "16" encoding: "UTF-8"
 
 new FormModel {
 	contentType: "form/swing"
@@ -47,13 +47,6 @@ new FormModel {
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 3 0"
 			} )
-			add( new FormComponent( "javax.swing.JButton" ) {
-				name: "button1"
-				"text": "change text"
-				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "changeText", false ) )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 4 0"
-			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "formattedTextFieldLabel"
 				"text": "JFormattedTextField:"
@@ -76,6 +69,83 @@ new FormModel {
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 2 1,growx"
 			} )
+			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
+				"$layoutConstraints": "hidemode 3"
+				"$columnConstraints": "[fill][fill]"
+				"$rowConstraints": "[][][][][]"
+			} ) {
+				name: "panel1"
+				"border": new javax.swing.border.TitledBorder( "Control" )
+				add( new FormComponent( "javax.swing.JButton" ) {
+					name: "button1"
+					"text": "change text"
+					addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "changeText", false ) )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 0 2 1,alignx left,growx 0"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "leftPaddingLabel"
+					"text": "Left padding:"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 1"
+				} )
+				add( new FormComponent( "javax.swing.JSpinner" ) {
+					name: "leftPaddingField"
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
+					addEvent( new FormEvent( "javax.swing.event.ChangeListener", "stateChanged", "paddingChanged", false ) )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 1"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "rightPaddingLabel"
+					"text": "Right padding:"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 2"
+				} )
+				add( new FormComponent( "javax.swing.JSpinner" ) {
+					name: "rightPaddingField"
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
+					addEvent( new FormEvent( "javax.swing.event.ChangeListener", "stateChanged", "paddingChanged", false ) )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 2"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "topPaddingLabel"
+					"text": "Top padding:"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 3"
+				} )
+				add( new FormComponent( "javax.swing.JSpinner" ) {
+					name: "topPaddingField"
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
+					addEvent( new FormEvent( "javax.swing.event.ChangeListener", "stateChanged", "paddingChanged", false ) )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 3"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "bottomPaddingLabel"
+					"text": "Bottom padding:"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 4"
+				} )
+				add( new FormComponent( "javax.swing.JSpinner" ) {
+					name: "bottomPaddingField"
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
+					addEvent( new FormEvent( "javax.swing.event.ChangeListener", "stateChanged", "paddingChanged", false ) )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 4"
+				} )
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 4 0 1 6,aligny top,growy 0"
+			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "passwordFieldLabel"
 				"text": "JPasswordField:"
@@ -217,7 +287,7 @@ new FormModel {
 				"prototypeDisplayValue": "12345"
 				"componentPopupMenu": #FormReference0
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 6,growx"
+				"value": "cell 2 6,growx,wmin 50"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "spinnerLabel"

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsKeysDump.java

@@ -29,6 +29,7 @@ import java.util.Locale;
 import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import com.formdev.flatlaf.*;
+import com.formdev.flatlaf.testing.FlatTestLaf;
 
 /**
  * Collects all FlatLaf UI defaults keys and dumps them to a file.
@@ -60,6 +61,7 @@ public class UIDefaultsKeysDump
 		collectKeys( FlatDarkLaf.class.getName(), keys );
 		collectKeys( FlatIntelliJLaf.class.getName(), keys );
 		collectKeys( FlatDarculaLaf.class.getName(), keys );
+		collectKeys( FlatTestLaf.class.getName(), keys );
 
 		// write key file
 		try( Writer fileWriter = new BufferedWriter( new FileWriter( keysFile ) ) ) {

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

@@ -400,6 +400,11 @@ ToggleButton.pressedBackground = #FFC800
 ToggleButton.toolbar.selectedBackground = #ddd
 
 
+#---- ToolBar ----
+
+ToolBar.focusableButtons = true
+
+
 #---- ToolTip ----
 
 ToolTip.background = #eef

flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt

@@ -18,6 +18,8 @@ Button.default.background
 Button.default.boldText
 Button.default.borderColor
 Button.default.borderWidth
+Button.default.endBackground
+Button.default.endBorderColor
 Button.default.focusColor
 Button.default.focusedBackground
 Button.default.focusedBorderColor
@@ -25,12 +27,16 @@ Button.default.foreground
 Button.default.hoverBackground
 Button.default.hoverBorderColor
 Button.default.pressedBackground
+Button.default.startBackground
+Button.default.startBorderColor
 Button.defaultButtonFollowsFocus
 Button.disabledBackground
 Button.disabledBorderColor
 Button.disabledForeground
 Button.disabledSelectedBackground
 Button.disabledText
+Button.endBackground
+Button.endBorderColor
 Button.focusInputMap
 Button.focusedBackground
 Button.focusedBorderColor
@@ -49,6 +55,8 @@ Button.rollover
 Button.selectedBackground
 Button.selectedForeground
 Button.shadow
+Button.startBackground
+Button.startBorderColor
 Button.textIconGap
 Button.textShiftOffset
 Button.toolbar.hoverBackground
@@ -142,6 +150,7 @@ ComboBox.buttonBackground
 ComboBox.buttonDarkShadow
 ComboBox.buttonDisabledArrowColor
 ComboBox.buttonEditableBackground
+ComboBox.buttonFocusedBackground
 ComboBox.buttonHighlight
 ComboBox.buttonHoverArrowColor
 ComboBox.buttonPressedArrowColor
@@ -150,6 +159,7 @@ ComboBox.buttonStyle
 ComboBox.disabledBackground
 ComboBox.disabledForeground
 ComboBox.editorColumns
+ComboBox.focusedBackground
 ComboBox.font
 ComboBox.foreground
 ComboBox.isEnterSelectablePopup
@@ -157,6 +167,7 @@ ComboBox.maximumRowCount
 ComboBox.minimumWidth
 ComboBox.noActionOnKeyNavigation
 ComboBox.padding
+ComboBox.popupBackground
 ComboBox.selectionBackground
 ComboBox.selectionForeground
 ComboBox.timeFactor
@@ -197,6 +208,7 @@ EditorPane.caretBlinkRate
 EditorPane.caretForeground
 EditorPane.disabledBackground
 EditorPane.focusInputMap
+EditorPane.focusedBackground
 EditorPane.font
 EditorPane.foreground
 EditorPane.inactiveBackground
@@ -226,6 +238,7 @@ FormattedTextField.caretBlinkRate
 FormattedTextField.caretForeground
 FormattedTextField.disabledBackground
 FormattedTextField.focusInputMap
+FormattedTextField.focusedBackground
 FormattedTextField.font
 FormattedTextField.foreground
 FormattedTextField.inactiveBackground
@@ -295,7 +308,9 @@ JXBusyLabel.baseColor
 JXBusyLabel.highlightColor
 JXDatePicker.border
 JXHeader.background
+JXHeader.descriptionForeground
 JXHeader.startBackground
+JXHeader.titleForeground
 JXMonthView.arrowColor
 JXMonthView.background
 JXMonthView.daysOfTheWeekForeground
@@ -475,6 +490,11 @@ OptionPane.buttonPadding
 OptionPane.errorIcon
 OptionPane.font
 OptionPane.foreground
+OptionPane.icon.errorColor
+OptionPane.icon.foreground
+OptionPane.icon.informationColor
+OptionPane.icon.questionColor
+OptionPane.icon.warningColor
 OptionPane.iconMessageGap
 OptionPane.informationIcon
 OptionPane.maxCharactersPerLine
@@ -500,6 +520,7 @@ PasswordField.caretForeground
 PasswordField.disabledBackground
 PasswordField.echoChar
 PasswordField.focusInputMap
+PasswordField.focusedBackground
 PasswordField.font
 PasswordField.foreground
 PasswordField.inactiveBackground
@@ -651,11 +672,14 @@ Slider.foreground
 Slider.highlight
 Slider.horizontalSize
 Slider.hoverThumbColor
+Slider.hoverTrackColor
 Slider.minimumHorizontalSize
 Slider.minimumVerticalSize
 Slider.onlyLeftMouseButtonDrag
 Slider.pressedThumbColor
+Slider.pressedTrackColor
 Slider.shadow
+Slider.thumbBorderColor
 Slider.thumbColor
 Slider.thumbSize
 Slider.tickColor
@@ -678,6 +702,7 @@ Spinner.disabledBackground
 Spinner.disabledForeground
 Spinner.editorAlignment
 Spinner.editorBorderPainted
+Spinner.focusedBackground
 Spinner.font
 Spinner.foreground
 Spinner.padding
@@ -753,6 +778,7 @@ TabbedPane.tabHeight
 TabbedPane.tabInsets
 TabbedPane.tabRunOverlay
 TabbedPane.tabSelectionHeight
+TabbedPane.tabSeparatorColor
 TabbedPane.tabSeparatorsFullHeight
 TabbedPane.tabWidthMode
 TabbedPane.tabsOpaque
@@ -820,6 +846,7 @@ TextArea.caretBlinkRate
 TextArea.caretForeground
 TextArea.disabledBackground
 TextArea.focusInputMap
+TextArea.focusedBackground
 TextArea.font
 TextArea.foreground
 TextArea.inactiveBackground
@@ -838,6 +865,7 @@ TextField.caretForeground
 TextField.darkShadow
 TextField.disabledBackground
 TextField.focusInputMap
+TextField.focusedBackground
 TextField.font
 TextField.foreground
 TextField.highlight
@@ -856,6 +884,7 @@ TextPane.caretBlinkRate
 TextPane.caretForeground
 TextPane.disabledBackground
 TextPane.focusInputMap
+TextPane.focusedBackground
 TextPane.font
 TextPane.foreground
 TextPane.inactiveBackground
@@ -865,6 +894,7 @@ TextPane.selectionBackground
 TextPane.selectionForeground
 TextPaneUI
 TitlePane.background
+TitlePane.borderColor
 TitlePane.buttonHoverBackground
 TitlePane.buttonMaximizedHeight
 TitlePane.buttonPressedBackground
@@ -902,9 +932,11 @@ ToggleButton.disabledBackground
 ToggleButton.disabledSelectedBackground
 ToggleButton.disabledText
 ToggleButton.focusInputMap
+ToggleButton.focusedBackground
 ToggleButton.font
 ToggleButton.foreground
 ToggleButton.highlight
+ToggleButton.hoverBackground
 ToggleButton.iconTextGap
 ToggleButton.light
 ToggleButton.margin
@@ -916,6 +948,7 @@ ToggleButton.shadow
 ToggleButton.tab.disabledUnderlineColor
 ToggleButton.tab.focusBackground
 ToggleButton.tab.hoverBackground
+ToggleButton.tab.selectedBackground
 ToggleButton.tab.underlineColor
 ToggleButton.tab.underlineHeight
 ToggleButton.textIconGap
@@ -933,6 +966,7 @@ ToolBar.dockingBackground
 ToolBar.dockingForeground
 ToolBar.floatingBackground
 ToolBar.floatingForeground
+ToolBar.focusableButtons
 ToolBar.font
 ToolBar.foreground
 ToolBar.gripColor
@@ -962,6 +996,7 @@ Tree.dropCellBackground
 Tree.dropCellForeground
 Tree.dropLineColor
 Tree.editorBorder
+Tree.editorBorderSelectionColor
 Tree.expandedIcon
 Tree.focusInputMap
 Tree.focusInputMap.RightToLeft