release 2.1

- added `ScrollBar.minimumButtonSize` to specify minimum scroll arrow button size
- center and scale arrows in scroll up/down buttons

(issue #493)

CHANGELOG.md

@@ -1,6 +1,36 @@
 FlatLaf Change Log
 ==================
 
+## 2.1
+
+#### New features and improvements
+
+- Menus: Improved usability of submenus. (PR #490; issue #247)
+- Menus: Scroll large menus using mouse wheel or up/down arrows. (issue #225)
+- Linux: Support using custom window decorations. Enable with
+  `JFrame.setDefaultLookAndFeelDecorated(true)` and
+  `JDialog.setDefaultLookAndFeelDecorated(true)` before creating a window.
+  (issue #482)
+- ScrollBar: Added UI value `ScrollBar.minimumButtonSize` to specify minimum
+  scroll arrow button size (if shown). (issue #493)
+
+#### Fixed bugs
+
+- PasswordField: Fixed reveal button appearance in IntelliJ themes. (issue #494)
+- ScrollBar: Center and scale arrows in scroll up/down buttons (if shown).
+  (issue #493)
+- TextArea, TextPane and EditorPane: No longer select all text when component is
+  focused for the first time. (issue #498; regression in FlatLaf 2.0)
+- TabbedPane: Disable all items in "Show Hidden Tabs" popup menu if tabbed pane
+  is disabled.
+
+#### Incompatibilities
+
+- Method `FlatUIUtils.paintArrow()` (and class `FlatArrowButton`) now paints
+  arrows one pixel smaller than before. To fix this, increase parameter
+  `arrowSize` by one.
+
+
 ## 2.0.2
 
 - Native window decorations (Windows 10/11 only): Fixed rendering artifacts on

build.gradle.kts

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

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

@@ -26,7 +26,7 @@ import javax.swing.UIDefaults;
  * Allows loading of additional .properties files from addon JARs.
  * {@link java.util.ServiceLoader} is used to load extensions of this class from addon JARs.
  * <p>
- * If you extend this class in a addon JAR, you also have to add a text file named
+ * If you extend this class in an addon JAR, you also have to add a text file named
  * {@code META-INF/services/com.formdev.flatlaf.FlatDefaultsAddon}
  * to the addon JAR. The file must contain a single line with the class name.
  * <p>
@@ -61,7 +61,7 @@ public abstract class FlatDefaultsAddon
 
 	/**
 	 * Returns the priority used to sort addon loading.
-	 * The order is only important if you want overwrite UI defaults of other addons.
+	 * The order is only important if you want to overwrite UI defaults of other addons.
 	 * Lower numbers mean higher priority.
 	 * Returns 10000 by default.
 	 */

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

@@ -19,7 +19,7 @@ package com.formdev.flatlaf;
 /**
  * Default color palette for action icons and object icons.
  * <p>
- * The idea is to use only this well defined set of colors in SVG icons and
+ * The idea is to use only this well-defined set of colors in SVG icons, and
  * then they are replaced at runtime to dark variants or to other theme colors.
  * Then a single SVG icon (light variant) can be used for dark themes too.
  * IntelliJ Platform uses this mechanism to allow themes to change IntelliJ Platform icons.
@@ -35,7 +35,7 @@ package com.formdev.flatlaf;
  * <p>
  * You may use these colors also in your application (outside of SVG icons), but do
  * not use the RGB values defined in this enum.<br>
- * Instead use {@code UIManager.getColor( FlatIconColors.ACTIONS_GREY.key )}.
+ * Instead, use {@code UIManager.getColor( FlatIconColors.ACTIONS_GREY.key )}.
  *
  * @author Karl Tauber
  */

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

@@ -596,7 +596,7 @@ class FlatInputMaps
 	//---- class LazyInputMapEx -----------------------------------------------
 
 	/**
-	 * Lazily creates a input map.
+	 * Lazily creates an input map.
 	 * Similar to {@link UIDefaults.LazyInputMap}, but can use multiple bindings arrays.
 	 */
 	private static class LazyInputMapEx

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

@@ -103,6 +103,7 @@ public abstract class FlatLaf
 
 	private PopupFactory oldPopupFactory;
 	private MnemonicHandler mnemonicHandler;
+	private SubMenuUsabilityHelper subMenuUsabilityHelper;
 
 	private Consumer<UIDefaults> postInitialization;
 	private List<Function<Object, Object>> uiDefaultsGetters;
@@ -166,18 +167,19 @@ public abstract class FlatLaf
 	 * Returns whether FlatLaf supports custom window decorations.
 	 * This depends on the operating system and on the used Java runtime.
 	 * <p>
-	 * This method returns {@code true} on Windows 10 (see exception below), {@code false} otherwise.
+	 * This method returns {@code true} on Windows 10/11 (see exception below)
+	 * and on Linux, {@code false} otherwise.
 	 * <p>
-	 * Returns also {@code false} on Windows 10 if:
+	 * Returns also {@code false} on Windows 10/11 if:
 	 * <ul>
-	 * <li>FlatLaf native window border support is available (requires Windows 10)</li>
+	 * <li>FlatLaf native window border support is available (requires Windows 10/11)</li>
 	 * <li>running in
 	 * <a href="https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime">JetBrains Runtime 11 (or later)</a>
 	 * (<a href="https://github.com/JetBrains/JetBrainsRuntime">source code on github</a>)
 	 * and JBR supports custom window decorations
 	 * </li>
 	 * </ul>
-	 * In this cases, custom decorations are enabled by the root pane.
+	 * In these cases, custom decorations are enabled by the root pane.
 	 * Usage of {@link JFrame#setDefaultLookAndFeelDecorated(boolean)} or
 	 * {@link JDialog#setDefaultLookAndFeelDecorated(boolean)} is not necessary.
 	 */
@@ -190,7 +192,7 @@ public abstract class FlatLaf
 			FlatNativeWindowBorder.isSupported() )
 		  return false;
 
-		return SystemInfo.isWindows_10_orLater;
+		return SystemInfo.isWindows_10_orLater || SystemInfo.isLinux;
 	}
 
 	@Override
@@ -243,6 +245,10 @@ public abstract class FlatLaf
 		mnemonicHandler = new MnemonicHandler();
 		mnemonicHandler.install();
 
+		// install submenu usability helper
+		subMenuUsabilityHelper = new SubMenuUsabilityHelper();
+		subMenuUsabilityHelper.install();
+
 		// listen to desktop property changes to update UI if system font or scaling changes
 		if( SystemInfo.isWindows ) {
 			// Windows 10 allows increasing font size independent of scaling:
@@ -322,6 +328,12 @@ public abstract class FlatLaf
 			mnemonicHandler = null;
 		}
 
+		// uninstall submenu usability helper
+		if( subMenuUsabilityHelper != null ) {
+			subMenuUsabilityHelper.uninstall();
+			subMenuUsabilityHelper = null;
+		}
+
 		// restore default link color
 		new HTMLEditorKit().getStyleSheet().addRule( "a, address { color: blue; }" );
 		postInitialization = null;
@@ -605,7 +617,7 @@ public abstract class FlatLaf
 			uiFont = ((ActiveFont)defaultFont).derive( baseFont, fontSize -> {
 				return Math.round( fontSize * UIScale.computeFontScaleFactor( baseFont ) );
 			} );
-		};
+		}
 
 		// increase font size if system property "flatlaf.uiScale" is set
 		uiFont = UIScale.applyCustomScaleFactor( uiFont );
@@ -760,7 +772,7 @@ public abstract class FlatLaf
 	 * Invoke this method before setting the look and feel.
 	 * <p>
 	 * If using Java modules, the package must be opened in {@code module-info.java}.
-	 * Otherwise use {@link #registerCustomDefaultsSource(URL)}.
+	 * Otherwise, use {@link #registerCustomDefaultsSource(URL)}.
 	 *
 	 * @param packageName a package name (e.g. "com.myapp.resources")
 	 */
@@ -862,7 +874,7 @@ public abstract class FlatLaf
 	 * E.g. using {@link UIManager#setLookAndFeel(LookAndFeel)} or {@link #setup(LookAndFeel)}.
 	 * <p>
 	 * The global extra defaults are useful for smaller additional defaults that may change.
-	 * E.g. accent color. Otherwise FlatLaf properties files should be used.
+	 * E.g. accent color. Otherwise, FlatLaf properties files should be used.
 	 * See {@link #registerCustomDefaultsSource(String)}.
 	 * <p>
 	 * The keys and values are strings in same format as in FlatLaf properties files.
@@ -894,7 +906,7 @@ public abstract class FlatLaf
 	 * E.g. using {@link UIManager#setLookAndFeel(LookAndFeel)} or {@link #setup(LookAndFeel)}.
 	 * <p>
 	 * The extra defaults are useful for smaller additional defaults that may change.
-	 * E.g. accent color. Otherwise FlatLaf properties files should be used.
+	 * E.g. accent color. Otherwise, FlatLaf properties files should be used.
 	 * See {@link #registerCustomDefaultsSource(String)}.
 	 * <p>
 	 * The keys and values are strings in same format as in FlatLaf properties files.
@@ -951,7 +963,7 @@ public abstract class FlatLaf
 				// re-set current LaF
 				UIManager.setLookAndFeel( lookAndFeel );
 
-				// must fire property change events ourself because old and new LaF are the same
+				// must fire property change events ourselves because old and new LaF are the same
 				PropertyChangeEvent e = new PropertyChangeEvent( UIManager.class, "lookAndFeel", lookAndFeel, lookAndFeel );
 				for( PropertyChangeListener l : UIManager.getPropertyChangeListeners() )
 					l.propertyChange( e );
@@ -995,7 +1007,7 @@ public abstract class FlatLaf
 	/**
 	 * Returns whether native window decorations are supported on current platform.
 	 * <p>
-	 * This requires Windows 10, but may be disabled if running in special environments
+	 * This requires Windows 10/11, but may be disabled if running in special environments
 	 * (JetBrains Projector, Webswing or WinPE) or if loading native library fails.
 	 * If system property {@link FlatSystemProperties#USE_WINDOW_DECORATIONS} is set to
 	 * {@code false}, then this method also returns {@code false}.

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

@@ -34,7 +34,7 @@ public interface FlatSystemProperties
 	 * To replace the Java 9+ system scale factor, use system property "sun.java2d.uiScale",
 	 * which has the same syntax as this one.
 	 * <p>
-	 * Since FlatLaf 1.1.2: Scale factors less then 100% are allowed.
+	 * Since FlatLaf 1.1.2: Scale factors less than 100% are allowed.
 	 * <p>
 	 * <strong>Allowed Values</strong> e.g. {@code 1.5}, {@code 1.5x}, {@code 150%} or {@code 144dpi} (96dpi is 100%)<br>
 	 */

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

@@ -175,7 +175,7 @@ public class IntelliJTheme
 		defaults.put( "Button.hoverBorderColor", defaults.get( "Button.focusedBorderColor" ) );
 		defaults.put( "HelpButton.hoverBorderColor", defaults.get( "Button.focusedBorderColor" ) );
 
-		// IDEA uses a SVG icon for the help button, but paints the background with Button.startBackground and Button.endBackground
+		// IDEA uses an SVG icon for the help button, but paints the background with Button.startBackground and Button.endBackground
 		Object helpButtonBackground = defaults.get( "Button.startBackground" );
 		Object helpButtonBorderColor = defaults.get( "Button.startBorderColor" );
 		if( helpButtonBackground == null )
@@ -242,7 +242,19 @@ public class IntelliJTheme
 			defaults.put( "Tree.rowHeight", 22 );
 
 		// apply theme specific UI defaults at the end to allow overwriting
-		defaults.putAll( themeSpecificDefaults );
+		for( Map.Entry<Object, Object> e : themeSpecificDefaults.entrySet() ) {
+			Object key = e.getKey();
+			Object value = e.getValue();
+
+			// append styles to existing styles
+			if( key instanceof String && ((String)key).startsWith( "[style]" ) ) {
+				Object oldValue = defaults.get( key );
+				if( oldValue != null )
+					value = oldValue + "; " + value;
+			}
+
+			defaults.put( key, value );
+		}
 	}
 
 	private Map<Object, Object> removeThemeSpecificDefaults( UIDefaults defaults ) {
@@ -534,12 +546,12 @@ public class IntelliJTheme
 	}
 
 	/** Rename UI default keys (key --> value). */
-	private static Map<String, String> uiKeyMapping = new HashMap<>();
+	private static final Map<String, String> uiKeyMapping = new HashMap<>();
 	/** Copy UI default keys (value --> key). */
-	private static Map<String, String> uiKeyCopying = new HashMap<>();
-	private static Map<String, String> uiKeyInverseMapping = new HashMap<>();
-	private static Map<String, String> checkboxKeyMapping = new HashMap<>();
-	private static Map<String, String> checkboxDuplicateColors = new HashMap<>();
+	private static final Map<String, String> uiKeyCopying = new HashMap<>();
+	private static final Map<String, String> uiKeyInverseMapping = new HashMap<>();
+	private static final Map<String, String> checkboxKeyMapping = new HashMap<>();
+	private static final Map<String, String> checkboxDuplicateColors = new HashMap<>();
 
 	static {
 		// ComboBox

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

@@ -170,7 +170,7 @@ class LinuxFontPolicy
 
 		Object value = Toolkit.getDefaultToolkit().getDesktopProperty( "gnome.Xft/DPI" );
 		if( value instanceof Integer ) {
-			int dpi = ((Integer)value).intValue() / 1024;
+			int dpi = (Integer) value / 1024;
 			if( dpi == -1 )
 				dpi = 96;
 			if( dpi < 50 )
@@ -197,7 +197,7 @@ class LinuxFontPolicy
 	}
 
 	/**
-	 * Gets the default font for KDE for KDE configuration files.
+	 * Gets the default font for KDE from KDE configuration files.
 	 *
 	 * The Swing fonts are not updated when the user changes system font size
 	 * (System Settings > Fonts > Force Font DPI). A application restart is necessary.
@@ -278,7 +278,7 @@ class LinuxFontPolicy
 		// read config file
 		ArrayList<String> lines = new ArrayList<>( 200 );
 		try( BufferedReader reader = new BufferedReader( new FileReader( file ) ) ) {
-			String line = null;
+			String line;
 			while( (line = reader.readLine()) != null )
 				lines.add( line );
 		} catch( IOException ex ) {

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

@@ -0,0 +1,322 @@
+/*
+ * Copyright 2022 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;
+
+import java.awt.AWTEvent;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.MouseInfo;
+import java.awt.Point;
+import java.awt.PointerInfo;
+import java.awt.Polygon;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
+import java.awt.Window;
+import java.awt.event.MouseEvent;
+import javax.swing.JComponent;
+import javax.swing.JLayeredPane;
+import javax.swing.JMenu;
+import javax.swing.JPopupMenu;
+import javax.swing.MenuElement;
+import javax.swing.MenuSelectionManager;
+import javax.swing.RootPaneContainer;
+import javax.swing.SwingUtilities;
+import javax.swing.Timer;
+import javax.swing.UIManager;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import com.formdev.flatlaf.ui.FlatUIUtils;
+
+/**
+ * Improves usability of submenus by using a
+ * <a href="https://height.app/blog/guide-to-build-context-menus#safe-triangle">safe triangle</a>
+ * to avoid that the submenu closes while the user moves the mouse to it.
+ *
+ * @author Karl Tauber
+ */
+class SubMenuUsabilityHelper
+	implements ChangeListener
+{
+	private static final String KEY_USE_SAFE_TRIANGLE = "Menu.useSafeTriangle";
+	private static final String KEY_SHOW_SAFE_TRIANGLE = "FlatLaf.debug.menu.showSafeTriangle";
+
+	private SubMenuEventQueue subMenuEventQueue;
+	private SafeTrianglePainter safeTrianglePainter;
+	private boolean changePending;
+
+	// mouse location in screen coordinates
+	private int mouseX;
+	private int mouseY;
+
+	// target popup bounds in screen coordinates
+	private int targetX;
+	private int targetTopY;
+	private int targetBottomY;
+
+	private Rectangle invokerBounds;
+
+	void install() {
+		MenuSelectionManager.defaultManager().addChangeListener( this );
+	}
+
+	void uninstall() {
+		MenuSelectionManager.defaultManager().removeChangeListener( this );
+		uninstallEventQueue();
+	}
+
+	@Override
+	public void stateChanged( ChangeEvent e ) {
+		if( !FlatUIUtils.getUIBoolean( KEY_USE_SAFE_TRIANGLE, true ))
+			return;
+
+		// handle menu selection change later, but only once in case of temporary changes
+		// e.g. moving mouse from one menu item to another one, fires two events:
+		//    1. old menu item is removed from menu selection
+		//    2. new menu item is added to menu selection
+		synchronized( this ) {
+			if( changePending )
+				return;
+			changePending = true;
+		}
+
+		EventQueue.invokeLater( () -> {
+			synchronized( this ) {
+				changePending = false;
+			}
+			menuSelectionChanged();
+		} );
+	}
+
+	private void menuSelectionChanged() {
+		MenuElement[] path = MenuSelectionManager.defaultManager().getSelectedPath();
+
+/*debug
+		System.out.println( "--- " + path.length );
+		for( int i = 0; i < path.length; i++ )
+			System.out.println( "   " + i + ": " + path[i].getClass().getName() );
+debug*/
+
+		// find submenu in menu selection
+		int subMenuIndex = findSubMenu( path );
+
+		// uninstall if there is no submenu in selection
+		if( subMenuIndex < 0 || subMenuIndex != path.length - 1 ) {
+			uninstallEventQueue();
+			return;
+		}
+
+		// get current mouse location
+		PointerInfo pointerInfo = MouseInfo.getPointerInfo();
+		Point mouseLocation = (pointerInfo != null) ? pointerInfo.getLocation() : new Point();
+		mouseX = mouseLocation.x;
+		mouseY = mouseLocation.y;
+
+		// check whether popup is showing, which is e.g. not the case if it is empty
+		JPopupMenu popup = (JPopupMenu) path[subMenuIndex];
+		if( !popup.isShowing() ) {
+			uninstallEventQueue();
+			return;
+		}
+
+		// get invoker screen bounds
+		Component invoker = popup.getInvoker();
+		invokerBounds = (invoker != null)
+			? new Rectangle( invoker.getLocationOnScreen(), invoker.getSize() )
+			: null;
+
+		// check whether mouse location is within invoker
+		if( invokerBounds != null && !invokerBounds.contains( mouseX, mouseY ) ) {
+			uninstallEventQueue();
+			return;
+		}
+
+		// compute top/bottom target locations
+		Point popupLocation = popup.getLocationOnScreen();
+		Dimension popupSize = popup.getSize();
+		targetX = (mouseX < popupLocation.x + (popupSize.width / 2))
+			? popupLocation.x
+			: popupLocation.x + popupSize.width;
+		targetTopY = popupLocation.y;
+		targetBottomY = popupLocation.y + popupSize.height;
+
+		// install own event queue to supress mouse events when mouse is moved within safe triangle
+		if( subMenuEventQueue == null )
+			subMenuEventQueue = new SubMenuEventQueue();
+
+		// create safe triangle painter
+		if( safeTrianglePainter == null && UIManager.getBoolean( KEY_SHOW_SAFE_TRIANGLE ) )
+			safeTrianglePainter = new SafeTrianglePainter( popup );
+	}
+
+	private void uninstallEventQueue() {
+		if( subMenuEventQueue != null ) {
+			subMenuEventQueue.uninstall();
+			subMenuEventQueue = null;
+		}
+
+		if( safeTrianglePainter != null ) {
+			safeTrianglePainter.uninstall();
+			safeTrianglePainter = null;
+		}
+	}
+
+	private int findSubMenu( MenuElement[] path ) {
+		for( int i = path.length - 1; i >= 1; i-- ) {
+			if( path[i] instanceof JPopupMenu &&
+				path[i - 1] instanceof JMenu &&
+				!((JMenu)path[i - 1]).isTopLevelMenu() )
+			  return i;
+		}
+		return -1;
+	}
+
+	private Polygon createSafeTriangle() {
+		return new Polygon(
+			new int[] { mouseX, targetX, targetX },
+			new int[] { mouseY, targetTopY, targetBottomY },
+			3 );
+	}
+
+	//---- class SubMenuEventQueue --------------------------------------------
+
+	private class SubMenuEventQueue
+		extends EventQueue
+	{
+		private Timer mouseUpdateTimer;
+		private Timer timeoutTimer;
+
+		private int newMouseX;
+		private int newMouseY;
+		private AWTEvent lastMouseEvent;
+
+		SubMenuEventQueue() {
+			// timer used to slightly delay update of mouse location used for safe triangle
+			mouseUpdateTimer = new Timer( 50, e -> {
+				mouseX = newMouseX;
+				mouseY = newMouseY;
+
+				if( safeTrianglePainter != null )
+					safeTrianglePainter.repaint();
+			} );
+			mouseUpdateTimer.setRepeats( false );
+
+			// timer used to timeout safe triangle when mouse stops moving
+			timeoutTimer = new Timer( 200, e -> {
+				if( invokerBounds != null && !invokerBounds.contains( newMouseX, newMouseY ) ) {
+					// post last mouse event, which selects menu item at mouse location
+					if( lastMouseEvent != null ) {
+						postEvent( lastMouseEvent );
+						lastMouseEvent = null;
+					}
+
+					uninstallEventQueue();
+					return;
+				}
+			} );
+			timeoutTimer.setRepeats( false );
+
+			Toolkit.getDefaultToolkit().getSystemEventQueue().push( this );
+		}
+
+		void uninstall() {
+			mouseUpdateTimer.stop();
+			mouseUpdateTimer = null;
+
+			timeoutTimer.stop();
+			timeoutTimer = null;
+
+			lastMouseEvent = null;
+
+			super.pop();
+		}
+
+		@Override
+		protected void dispatchEvent( AWTEvent e ) {
+			int id = e.getID();
+
+			if( e instanceof MouseEvent &&
+				(id == MouseEvent.MOUSE_MOVED || id == MouseEvent.MOUSE_DRAGGED) )
+			{
+				newMouseX = ((MouseEvent)e).getXOnScreen();
+				newMouseY = ((MouseEvent)e).getYOnScreen();
+
+				if( safeTrianglePainter != null )
+					safeTrianglePainter.repaint();
+
+				mouseUpdateTimer.stop();
+				timeoutTimer.stop();
+
+				// check whether mouse moved within safe triangle
+				if( createSafeTriangle().contains( newMouseX, newMouseY ) ) {
+					// update mouse location delayed (this changes the safe triangle)
+					mouseUpdateTimer.start();
+
+					timeoutTimer.start();
+
+					// remember last mouse event, which will be posted if the mouse stops moving
+					lastMouseEvent = e;
+
+					// ignore mouse event
+					return;
+				}
+
+				// update mouse location immediately (this changes the safe triangle)
+				mouseX = newMouseX;
+				mouseY = newMouseY;
+			}
+
+			super.dispatchEvent( e );
+		}
+	}
+
+	//---- class SafeTrianglePainter ------------------------------------------
+
+	private class SafeTrianglePainter
+		extends JComponent
+	{
+		SafeTrianglePainter( JPopupMenu popup ) {
+			Window window = SwingUtilities.windowForComponent( popup.getInvoker() );
+			if( window instanceof RootPaneContainer ) {
+				JLayeredPane layeredPane = ((RootPaneContainer)window).getLayeredPane();
+				setSize( layeredPane.getSize() );
+				layeredPane.add( this, new Integer( JLayeredPane.POPUP_LAYER + 1 ) );
+			}
+		}
+
+		void uninstall() {
+			Container parent = getParent();
+			if( parent != null ) {
+				parent.remove( this );
+				parent.repaint();
+			}
+		}
+
+		@Override
+		protected void paintComponent( Graphics g ) {
+			Point locationOnScreen = getLocationOnScreen();
+			g.translate( -locationOnScreen.x, -locationOnScreen.y );
+
+			g.setColor( Color.red );
+			((Graphics2D)g).draw( createSafeTriangle() );
+		}
+	}
+}

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

@@ -350,7 +350,7 @@ class UIDefaultsLoader
 	enum ValueType { UNKNOWN, STRING, BOOLEAN, CHARACTER, INTEGER, INTEGERORFLOAT, FLOAT, BORDER, ICON, INSETS, DIMENSION, COLOR, FONT,
 		SCALEDINTEGER, SCALEDFLOAT, SCALEDINSETS, SCALEDDIMENSION, INSTANCE, CLASS, GRAYFILTER, NULL, LAZY }
 
-	private static ValueType[] tempResultValueType = new ValueType[1];
+	private static final ValueType[] tempResultValueType = new ValueType[1];
 	private static Map<Class<?>, ValueType> javaValueTypes;
 	private static Map<String, ValueType> knownValueTypes;
 
@@ -792,7 +792,7 @@ class UIDefaultsLoader
 	 * Syntax: if(condition,trueValue,falseValue)
 	 * <p>
 	 * This "if" function is only used if the "if" is passed as parameter to another
-	 * color function. Otherwise the general "if" function is used.
+	 * color function. Otherwise, the general "if" function is used.
 	 */
 	private static Object parseColorIf( String value, List<String> params, Function<String, String> resolver, boolean reportError ) {
 		if( params.size() != 3 )
@@ -1209,7 +1209,7 @@ class UIDefaultsLoader
 		}
 
 		Integer integer = parseInteger( value, true );
-		if( integer.intValue() < min || integer.intValue() > max )
+		if( integer < min || integer > max )
 			throw new NumberFormatException( "integer '" + value + "' out of range (" + min + '-' + max + ')' );
 		return integer;
 	}
@@ -1250,28 +1250,28 @@ class UIDefaultsLoader
 
 	private static ActiveValue parseScaledInteger( String value ) {
 		int val = parseInteger( value, true );
-		return (ActiveValue) t -> {
+		return t -> {
 			return UIScale.scale( val );
 		};
 	}
 
 	private static ActiveValue parseScaledFloat( String value ) {
 		float val = parseFloat( value, true );
-		return (ActiveValue) t -> {
+		return t -> {
 			return UIScale.scale( val );
 		};
 	}
 
 	private static ActiveValue parseScaledInsets( String value ) {
 		Insets insets = parseInsets( value );
-		return (ActiveValue) t -> {
+		return t -> {
 			return UIScale.scale( insets );
 		};
 	}
 
 	private static ActiveValue parseScaledDimension( String value ) {
 		Dimension dimension = parseDimension( value );
-		return (ActiveValue) t -> {
+		return t -> {
 			return UIScale.scale( dimension );
 		};
 	}

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

@@ -23,13 +23,13 @@ import java.awt.Graphics2D;
 import com.formdev.flatlaf.util.AnimatedIcon;
 
 /**
- * Base class for animated icons that scales width and height, creates and initializes
+ * Base class for animated icons that scale width and height, creates and initializes
  * a scaled graphics context for icon painting.
  * <p>
  * Subclasses do not need to scale icon painting.
  * <p>
  * This class does not store any state information (needed for animation) in its instance.
- * Instead a client property is set on the painted component.
+ * Instead, a client property is set on the painted component.
  * This makes it possible to use a share icon instance for multiple components.
  *
  * @author Karl Tauber

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

@@ -51,7 +51,7 @@ public class FlatAscendingSortIcon
 		boolean chevron = this.chevron;
 		Color sortIconColor = this.sortIconColor;
 
-		// Because this icons are always shared for all table headers,
+		// Because this icon is always shared for all table headers,
 		// get icon specific style from FlatTableHeaderUI.
 		JTableHeader tableHeader = (JTableHeader) SwingUtilities.getAncestorOfClass( JTableHeader.class, c );
 		if( tableHeader != null ) {

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

@@ -76,7 +76,7 @@ public class FlatTreeCollapsedIcon
 	}
 
 	/**
-	 * Because this icons are always shared for all trees,
+	 * Because this icon is always shared for all trees,
 	 * get icon specific style from FlatTreeUI.
 	 */
 	static <T> T getStyleFromTreeUI( Component c, Function<FlatTreeUI, T> f ) {

flatlaf-core/src/main/java/com/formdev/flatlaf/resources/EmptyPackage.java

@@ -18,8 +18,8 @@ package com.formdev.flatlaf.resources;
 
 /**
  * The only purpose of this file is to add a .class file to this package to make it non-empty.
- * Otherwise the compiler outputs a warning because this package is opend in module-info.java.
- * Also when using --patch-module (e.g. from an IDE), an error would occur for empty packages.
+ * Otherwise, the compiler outputs a warning because this package is opened in module-info.java.
+ * Also, when using --patch-module (e.g. from an IDE), an error would occur for empty packages.
  *
  * @author Karl Tauber
  */

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

@@ -37,7 +37,7 @@ public class FlatArrowButton
 	extends BasicArrowButton
 	implements UIResource
 {
-	public static final int DEFAULT_ARROW_WIDTH = 8;
+	public static final int DEFAULT_ARROW_WIDTH = 9;
 
 	protected boolean chevron;
 	protected Color foreground;
@@ -211,6 +211,6 @@ public class FlatArrowButton
 		if( vert && parent instanceof JComponent && FlatUIUtils.hasRoundBorder( (JComponent) parent ) )
 			x -= scale( parent.getComponentOrientation().isLeftToRight() ? 1 : -1 );
 
-		FlatUIUtils.paintArrow( g, x, 0, getWidth(), getHeight(), getDirection(), chevron, arrowWidth, xOffset, yOffset );
+		FlatUIUtils.paintArrow( g, x, 0, getWidth(), getHeight(), getDirection(), chevron, getArrowWidth(), getXOffset(), getYOffset() );
 	}
 }

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

@@ -159,7 +159,7 @@ public class FlatButtonBorder
 	public Insets getBorderInsets( Component c, Insets insets ) {
 		if( FlatButtonUI.isToolBarButton( c ) ) {
 			// In toolbars, use button margin only if explicitly set.
-			// Otherwise use toolbar margin specified in UI defaults.
+			// Otherwise, use toolbar margin specified in UI defaults.
 			Insets margin = (c instanceof AbstractButton)
 				? ((AbstractButton)c).getMargin()
 				: null;

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

@@ -343,7 +343,7 @@ public class FlatButtonUI
 
 	/**
 	 * Returns true if the button has an icon but no text,
-	 * or it it does not have an icon and the text is either "..." or one character.
+	 * or it does not have an icon and the text is either "..." or one character.
 	 */
 	static boolean isIconOnlyOrSingleCharacterButton( Component c ) {
 		if( !(c instanceof JButton) && !(c instanceof JToggleButton) )

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

@@ -96,7 +96,7 @@ public class FlatCaret
 
 			// if text component is focused, then caret and selection are visible,
 			// but when switching theme, the component does not yet have
-			// an highlighter and the selection is not painted
+			// a highlighter and the selection is not painted
 			// --> make selection temporary invisible later, then the caret
 			//     adds selection highlights to the text component highlighter
 			if( isSelectionVisible() ) {
@@ -236,7 +236,7 @@ public class FlatCaret
 		if( selectAllOnFocusPolicy == null )
 			selectAllOnFocusPolicy = this.selectAllOnFocusPolicy;
 
-		if( SELECT_ALL_ON_FOCUS_POLICY_NEVER.equals( selectAllOnFocusPolicy ) )
+		if( selectAllOnFocusPolicy == null || SELECT_ALL_ON_FOCUS_POLICY_NEVER.equals( selectAllOnFocusPolicy ) )
 			return;
 
 		if( !SELECT_ALL_ON_FOCUS_POLICY_ALWAYS.equals( selectAllOnFocusPolicy ) ) {

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

@@ -700,7 +700,7 @@ public class FlatComboBoxUI
 				return true;
 
 			Component editorComponent = comboBox.getEditor().getEditorComponent();
-			return (editorComponent != null) ? FlatUIUtils.isPermanentFocusOwner( editorComponent ) : false;
+			return editorComponent != null && FlatUIUtils.isPermanentFocusOwner( editorComponent );
 		} else
 			return FlatUIUtils.isPermanentFocusOwner( comboBox );
 	}

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

@@ -72,7 +72,7 @@ public class FlatListCellBorder
 	}
 
 	/**
-	 * Because this borders are always shared for all lists,
+	 * Because this border is always shared for all lists,
 	 * get border specific style from FlatListUI.
 	 */
 	static <T> T getStyleFromListUI( Component c, Function<FlatListUI, T> f ) {

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

@@ -212,7 +212,7 @@ public class FlatListUI
 	/**
 	 * Toggle selection colors from focused to inactive and vice versa.
 	 *
-	 * This is not a optimal solution but much easier than rewriting the whole paint methods.
+	 * This is not an optimal solution but much easier than rewriting the whole paint methods.
 	 *
 	 * Using a LaF specific renderer was avoided because often a custom renderer is
 	 * already used in applications. Then either the inactive colors are not used,

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

@@ -210,7 +210,7 @@ public class FlatMenuBarUI
 		// check whether:
 		// - TitlePane.unifiedBackground is true and
 		// - menu bar is the "main" menu bar and
-		// - window has custom decorations enabled
+		// - window root pane has custom decoration style
 
 		JRootPane rootPane;
 		// (not storing value of "TitlePane.unifiedBackground" in class to allow changing at runtime)
@@ -218,7 +218,7 @@ public class FlatMenuBarUI
 			(rootPane = SwingUtilities.getRootPane( c )) != null &&
 			rootPane.getParent() instanceof Window &&
 			rootPane.getJMenuBar() == c &&
-			FlatNativeWindowBorder.hasCustomDecoration( (Window) rootPane.getParent() );
+			rootPane.getWindowDecorationStyle() != JRootPane.NONE;
 	}
 
 	//---- class TakeFocus ----------------------------------------------------

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

@@ -35,7 +35,7 @@ import javax.swing.plaf.MenuBarUI;
 public class FlatMenuItemBorder
 	extends FlatMarginBorder
 {
-	// only used if parent menubar is not a instance of FlatMenuBarUI
+	// only used if parent menubar is not an instance of FlatMenuBarUI
 	private final Insets menuBarItemMargins = UIManager.getInsets( "MenuBar.itemMargins" );
 
 	@Override

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

@@ -143,7 +143,7 @@ public class FlatPopupFactory
 	 * <p>
 	 * On a dual screen setup, where screens use different scale factors, it may happen
 	 * that the window location changes when showing a heavy weight popup window.
-	 * E.g. when opening an dialog on the secondary screen and making combobox popup visible.
+	 * E.g. when opening a dialog on the secondary screen and making combobox popup visible.
 	 * <p>
 	 * This is a workaround for https://bugs.openjdk.java.net/browse/JDK-8224608
 	 */

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

@@ -16,18 +16,58 @@
 
 package com.formdev.flatlaf.ui;
 
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.Graphics;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.Insets;
 import java.awt.LayoutManager;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
 import java.beans.PropertyChangeListener;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 import javax.swing.BoxLayout;
+import javax.swing.JButton;
 import javax.swing.JComponent;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
+import javax.swing.JViewport;
+import javax.swing.MenuElement;
+import javax.swing.MenuSelectionManager;
+import javax.swing.Popup;
+import javax.swing.PopupFactory;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.Timer;
+import javax.swing.UIManager;
+import javax.swing.event.MenuKeyEvent;
+import javax.swing.event.MenuKeyListener;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
+import javax.swing.plaf.ButtonUI;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.UIResource;
+import javax.swing.plaf.basic.BasicComboPopup;
+import javax.swing.plaf.basic.BasicMenuItemUI;
 import javax.swing.plaf.basic.BasicPopupMenuUI;
 import javax.swing.plaf.basic.DefaultMenuLayout;
+import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
 import com.formdev.flatlaf.util.LoggingFacade;
 
@@ -41,12 +81,22 @@ import com.formdev.flatlaf.util.LoggingFacade;
  * @uiDefault PopupMenu.foreground						Color
  * @uiDefault PopupMenu.border							Border
  *
+ * <!-- FlatPopupMenuUI -->
+ *
+ * @uiDefault Component.arrowType					String	chevron (default) or triangle
+ * @uiDefault PopupMenu.scrollArrowColor			Color
+ * @uiDefault PopupMenu.hoverScrollArrowBackground	Color	optional
+ *
  * @author Karl Tauber
  */
 public class FlatPopupMenuUI
 	extends BasicPopupMenuUI
 	implements StyleableUI
 {
+	/** @since 2.1 */ @Styleable protected String arrowType;
+	/** @since 2.1 */ @Styleable protected Color scrollArrowColor;
+	/** @since 2.1 */ @Styleable protected Color hoverScrollArrowBackground;
+
 	private PropertyChangeListener propertyChangeListener;
 	private Map<String, Object> oldStyleValues;
 	private AtomicBoolean borderShared;
@@ -74,11 +124,23 @@ public class FlatPopupMenuUI
 	public void installDefaults() {
 		super.installDefaults();
 
+		arrowType = UIManager.getString( "Component.arrowType" );
+		scrollArrowColor = UIManager.getColor( "PopupMenu.scrollArrowColor" );
+		hoverScrollArrowBackground = UIManager.getColor( "PopupMenu.hoverScrollArrowBackground" );
+
 		LayoutManager layout = popupMenu.getLayout();
 		if( layout == null || layout instanceof UIResource )
 			popupMenu.setLayout( new FlatMenuLayout( popupMenu, BoxLayout.Y_AXIS ) );
 	}
 
+	@Override
+	protected void uninstallDefaults() {
+		super.uninstallDefaults();
+
+		scrollArrowColor = null;
+		hoverScrollArrowBackground = null;
+	}
+
 	@Override
 	protected void installListeners() {
 		super.installListeners();
@@ -122,6 +184,52 @@ public class FlatPopupMenuUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this, popupMenu.getBorder() );
 	}
 
+	@Override
+	public Popup getPopup( JPopupMenu popup, int x, int y ) {
+		// do not add scroller to combobox popups or to popups that already have a scroll pane
+		if( popup instanceof BasicComboPopup ||
+			(popup.getComponentCount() > 0 && popup.getComponent( 0 ) instanceof JScrollPane) )
+		  return super.getPopup( popup, x, y );
+
+		// do not add scroller if popup fits into screen
+		Dimension prefSize = popup.getPreferredSize();
+		int screenHeight = getScreenHeightAt( x, y );
+		if( prefSize.height <= screenHeight )
+			return super.getPopup( popup, x, y );
+
+		// create scroller
+		FlatPopupScroller scroller = new FlatPopupScroller( popup );
+		scroller.setPreferredSize( new Dimension( prefSize.width, screenHeight ) );
+
+		// create popup
+		PopupFactory popupFactory = PopupFactory.getSharedInstance();
+		return popupFactory.getPopup( popup.getInvoker(), scroller, x, y );
+	}
+
+	private int getScreenHeightAt( int x, int y ) {
+		// find GraphicsConfiguration at popup location (similar to JPopupMenu.getCurrentGraphicsConfiguration())
+		GraphicsConfiguration gc = null;
+		for( GraphicsDevice device : GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices() ) {
+			if( device.getType() == GraphicsDevice.TYPE_RASTER_SCREEN ) {
+				GraphicsConfiguration dgc = device.getDefaultConfiguration();
+				if( dgc.getBounds().contains( x, y ) ) {
+					gc = dgc;
+					break;
+				}
+			}
+		}
+		if( gc == null && popupMenu.getInvoker() != null )
+			gc = popupMenu.getInvoker().getGraphicsConfiguration();
+
+		// compute screen height
+		// (always subtract screen insets because there is no API to detect whether
+		// the popup can overlap the taskbar; see JPopupMenu.canPopupOverlapTaskBar())
+		Toolkit toolkit = Toolkit.getDefaultToolkit();
+		Rectangle screenBounds = (gc != null) ? gc.getBounds() : new Rectangle( toolkit.getScreenSize() );
+		Insets screenInsets = Toolkit.getDefaultToolkit().getScreenInsets( gc );
+		return screenBounds.height - screenInsets.top - screenInsets.bottom;
+	}
+
 	//---- class FlatMenuLayout -----------------------------------------------
 
 	protected static class FlatMenuLayout
@@ -138,4 +246,206 @@ public class FlatPopupMenuUI
 			return super.preferredLayoutSize( target );
 		}
 	}
+
+	//---- class FlatPopupScroller --------------------------------------------
+
+	private class FlatPopupScroller
+		extends JPanel
+		implements MouseWheelListener, PopupMenuListener, MenuKeyListener
+	{
+		private final JPopupMenu popup;
+
+		private final JScrollPane scrollPane;
+		private final JButton scrollUpButton;
+		private final JButton scrollDownButton;
+		private int unitIncrement;
+
+		FlatPopupScroller( JPopupMenu popup ) {
+			super( new BorderLayout() );
+			this.popup = popup;
+
+			// this panel is required to avoid that JPopupMenu.setLocation() will be invoked
+			// while scrolling, because this would call JPopupMenu.showPopup()
+			JPanel view = new JPanel( new BorderLayout() );
+			view.add( popup, BorderLayout.CENTER );
+
+			scrollPane = new JScrollPane( view, JScrollPane.VERTICAL_SCROLLBAR_NEVER, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER );
+			scrollPane.setBorder( null );
+
+			scrollUpButton = new ArrowButton( SwingConstants.NORTH );
+			scrollDownButton = new ArrowButton( SwingConstants.SOUTH );
+
+			add( scrollPane, BorderLayout.CENTER );
+			add( scrollUpButton, BorderLayout.NORTH );
+			add( scrollDownButton, BorderLayout.SOUTH );
+
+			setBackground( popup.getBackground() );
+			setBorder( popup.getBorder() );
+			popup.setBorder( null );
+
+			popup.addPopupMenuListener( this );
+			popup.addMouseWheelListener( this );
+			popup.addMenuKeyListener( this );
+
+			updateArrowButtons();
+		}
+
+		void scroll( int unitsToScroll ) {
+			if( unitIncrement == 0 )
+				unitIncrement = new JMenuItem( "X" ).getPreferredSize().height;
+
+			JViewport viewport = scrollPane.getViewport();
+			Point viewPosition = viewport.getViewPosition();
+			int newY = viewPosition.y + (unitIncrement * unitsToScroll);
+			if( newY < 0 )
+				newY = 0;
+			else
+				newY = Math.min( newY, viewport.getViewSize().height - viewport.getExtentSize().height );
+			viewport.setViewPosition( new Point( viewPosition.x, newY ) );
+
+			updateArrowButtons();
+		}
+
+		void updateArrowButtons() {
+			JViewport viewport = scrollPane.getViewport();
+			Point viewPosition = viewport.getViewPosition();
+
+			scrollUpButton.setVisible( viewPosition.y > 0 );
+			scrollDownButton.setVisible( viewPosition.y < viewport.getViewSize().height - viewport.getExtentSize().height );
+		}
+
+		//---- interface PopupMenuListener ----
+
+		@Override
+		public void popupMenuWillBecomeInvisible( PopupMenuEvent e ) {
+			// restore popup border
+			popup.setBorder( getBorder() );
+
+			popup.removePopupMenuListener( this );
+			popup.removeMouseWheelListener( this );
+			popup.removeMenuKeyListener( this );
+		}
+
+		@Override public void popupMenuWillBecomeVisible( PopupMenuEvent e ) {}
+		@Override public void popupMenuCanceled( PopupMenuEvent e ) {}
+
+		//---- interface MouseWheelListener ----
+
+		/**
+		 * Scroll when user rotates mouse wheel.
+		 */
+		@Override
+		public void mouseWheelMoved( MouseWheelEvent e ) {
+			// convert mouse location before scrolling
+			Point mouseLocation = SwingUtilities.convertPoint( (Component) e.getSource(), e.getPoint(), this );
+
+			// scroll
+			scroll( e.getUnitsToScroll() );
+
+			// select menu item at mouse location
+			Component c = SwingUtilities.getDeepestComponentAt( this, mouseLocation.x, mouseLocation.y );
+			if( c instanceof JMenuItem ) {
+				ButtonUI ui = ((JMenuItem)c).getUI();
+				if( ui instanceof BasicMenuItemUI )
+					MenuSelectionManager.defaultManager().setSelectedPath( ((BasicMenuItemUI)ui).getPath() );
+			}
+
+			// this avoids that the popup is closed when running on Java 8
+			// https://bugs.openjdk.java.net/browse/JDK-8075063
+			e.consume();
+		}
+
+		//---- interface MenuKeyListener ----
+
+		/**
+		 * Scroll when user presses Up or Down keys.
+		 */
+		@Override
+		public void menuKeyPressed( MenuKeyEvent e ) {
+			// use invokeLater() because menu selection is not yet updated because
+			// this listener is invoked before another listener that updates the menu selection
+			EventQueue.invokeLater( () -> {
+				if( !isDisplayable() )
+					return;
+
+				MenuElement[] path = MenuSelectionManager.defaultManager().getSelectedPath();
+				if( path.length == 0 )
+					return;
+
+				// scroll selected menu item to visible area
+				Component c = path[path.length - 1].getComponent();
+				JViewport viewport = scrollPane.getViewport();
+				Point pt = SwingUtilities.convertPoint( c, 0, 0, viewport );
+				viewport.scrollRectToVisible( new Rectangle( pt, c.getSize() ) );
+
+				// update arrow buttons
+				boolean upVisible = scrollUpButton.isVisible();
+				updateArrowButtons();
+				if( !upVisible && scrollUpButton.isVisible() ) {
+					// if "up" button becomes visible, make sure that bottom menu item stays visible
+					Point viewPosition = viewport.getViewPosition();
+					int newY = viewPosition.y + scrollUpButton.getPreferredSize().height;
+					viewport.setViewPosition( new Point( viewPosition.x, newY ) );
+				}
+			} );
+		}
+
+		@Override public void menuKeyTyped( MenuKeyEvent e ) {}
+		@Override public void menuKeyReleased( MenuKeyEvent e ) {}
+
+		//---- class ArrowButton ----------------------------------------------
+
+		private class ArrowButton
+			extends FlatArrowButton
+			implements MouseListener, ActionListener
+		{
+			private Timer timer;
+
+			ArrowButton( int direction ) {
+				super( direction, arrowType, scrollArrowColor, null, null, hoverScrollArrowBackground, null, null );
+
+				addMouseListener( this );
+			}
+
+			@Override
+			public void paint( Graphics g ) {
+				// always fill background to paint over border on HiDPI screens
+				g.setColor( popup.getBackground() );
+				g.fillRect( 0, 0, getWidth(), getHeight() );
+
+				super.paint( g );
+			}
+
+			//---- interface MouseListener ----
+
+			@Override public void mouseClicked( MouseEvent e ) {}
+			@Override public void mousePressed( MouseEvent e ) {}
+			@Override public void mouseReleased( MouseEvent e ) {}
+
+			@Override
+			public void mouseEntered( MouseEvent e ) {
+				if( timer == null )
+					timer = new Timer( 50, this );
+				timer.start();
+			}
+
+			@Override
+			public void mouseExited( MouseEvent e ) {
+				if( timer != null )
+					timer.stop();
+			}
+
+			//---- interface ActionListener ----
+
+			@Override
+			public void actionPerformed( ActionEvent e ) {
+				if( timer != null && !isDisplayable() ) {
+					timer.stop();
+					return;
+				}
+
+				scroll( direction == SwingConstants.NORTH ? -1 : 1 );
+			}
+		}
+	}
 }

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

@@ -199,7 +199,7 @@ public class FlatRadioButtonUI
 		return infos;
 	}
 
-	private static Insets tempInsets = new Insets( 0, 0, 0, 0 );
+	private static final Insets tempInsets = new Insets( 0, 0, 0, 0 );
 
 	@Override
 	public Dimension getPreferredSize( JComponent c ) {
@@ -212,7 +212,7 @@ public class FlatRadioButtonUI
 		if( focusWidth > 0 ) {
 			// Increase preferred width and height if insets were explicitly reduced (e.g. with
 			// an EmptyBorder) and icon has a focus width, which is not included in icon size.
-			// Otherwise the component may be too small and outer focus border may be cut off.
+			// Otherwise, the component may be too small and outer focus border may be cut off.
 			Insets insets = c.getInsets( tempInsets );
 			size.width += Math.max( focusWidth - insets.left, 0 ) + Math.max( focusWidth - insets.right, 0 );
 			size.height += Math.max( focusWidth - insets.top, 0 ) + Math.max( focusWidth - insets.bottom, 0 );

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

@@ -179,8 +179,8 @@ public class FlatRootPaneUI
 		super.installListeners( root );
 
 		if( SystemInfo.isJava_9_orLater ) {
-			// On HiDPI screens, where scaling is used, there may be white lines at the
-			// bottom and at the right side of the window when it is initially shown.
+			// On HiDPI screens, where scaling is used, there may be white lines on the
+			// bottom and on the right side of the window when it is initially shown.
 			// This is very disturbing in dark themes, but hard to notice in light themes.
 			// Seems to be a rounding issue when Swing adds dirty region of window
 			// using RepaintManager.nativeAddDirtyRegion().
@@ -510,7 +510,7 @@ public class FlatRootPaneUI
 				return;
 
 			Container parent = c.getParent();
-			boolean active = parent instanceof Window ? ((Window)parent).isActive() : false;
+			boolean active = parent instanceof Window && ((Window)parent).isActive();
 
 			g.setColor( FlatUIUtils.deriveColor( active ? activeBorderColor : inactiveBorderColor, baseBorderColor ) );
 			HiDPIUtils.paintAtScale1x( (Graphics2D) g, x, y, width, height, this::paintImpl );
@@ -522,9 +522,7 @@ public class FlatRootPaneUI
 
 		protected boolean isWindowMaximized( Component c ) {
 			Container parent = c.getParent();
-			return parent instanceof Frame
-				? (((Frame)parent).getExtendedState() & Frame.MAXIMIZED_BOTH) != 0
-				: false;
+			return parent instanceof Frame && (((Frame)parent).getExtendedState() & Frame.MAXIMIZED_BOTH) != 0;
 		}
 	}
 

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

@@ -57,6 +57,7 @@ import com.formdev.flatlaf.util.UIScale;
  *
  * <!-- FlatScrollBarUI -->
  *
+ * @uiDefault ScrollBar.minimumButtonSize			Dimension
  * @uiDefault ScrollBar.trackInsets					Insets
  * @uiDefault ScrollBar.thumbInsets					Insets
  * @uiDefault ScrollBar.trackArc					int
@@ -83,6 +84,7 @@ public class FlatScrollBarUI
 	// overrides BasicScrollBarUI.supportsAbsolutePositioning (which is private)
 	@Styleable protected boolean allowsAbsolutePositioning;
 
+	/** @since 2.1 */ @Styleable protected Dimension minimumButtonSize;
 	@Styleable protected Insets trackInsets;
 	@Styleable protected Insets thumbInsets;
 	@Styleable protected int trackArc;
@@ -142,6 +144,7 @@ public class FlatScrollBarUI
 
 		allowsAbsolutePositioning = super.getSupportsAbsolutePositioning();
 
+		minimumButtonSize = UIManager.getDimension( "ScrollBar.minimumButtonSize" );
 		trackInsets = UIManager.getInsets( "ScrollBar.trackInsets" );
 		thumbInsets = UIManager.getInsets( "ScrollBar.thumbInsets" );
 		trackArc = UIManager.getInt( "ScrollBar.trackArc" );
@@ -171,6 +174,7 @@ public class FlatScrollBarUI
 	protected void uninstallDefaults() {
 		super.uninstallDefaults();
 
+		minimumButtonSize = null;
 		trackInsets = null;
 		thumbInsets = null;
 		hoverTrackColor = null;
@@ -451,7 +455,6 @@ public class FlatScrollBarUI
 			super( direction, type, foreground, disabledForeground,
 				hoverForeground, hoverBackground, pressedForeground, pressedBackground );
 
-			setArrowWidth( FlatArrowButton.DEFAULT_ARROW_WIDTH - 2 );
 			setFocusable( false );
 			setRequestFocusEnabled( false );
 		}
@@ -461,6 +464,18 @@ public class FlatScrollBarUI
 				null, hoverButtonBackground, null, pressedButtonBackground );
 		}
 
+		@Override
+		public int getArrowWidth() {
+			// scale arrow size depending on scroll bar width
+			// (6 is default arrow width; 10 is base scroll bar width)
+			int arrowWidth = Math.round( 6 * (scrollBarWidth / 10f) );
+
+			// compute arrow size that leaves equal space on both sides (arrow is centered)
+			arrowWidth = scrollBarWidth - (((scrollBarWidth - arrowWidth) / 2) * 2);
+
+			return arrowWidth;
+		}
+
 		@Override
 		protected Color deriveBackground( Color background ) {
 			return FlatUIUtils.deriveColor( background, scrollbar.getBackground() );
@@ -469,8 +484,9 @@ public class FlatScrollBarUI
 		@Override
 		public Dimension getPreferredSize() {
 			if( isShowButtons() ) {
-				int w = UIScale.scale( scrollBarWidth );
-				return new Dimension( w, w );
+				int w = UIScale.scale( Math.max( scrollBarWidth, (minimumButtonSize != null) ? minimumButtonSize.width : 0 ) );
+				int h = UIScale.scale( Math.max( scrollBarWidth, (minimumButtonSize != null) ? minimumButtonSize.height : 0 ) );
+				return new Dimension( w, h );
 			} else
 				return new Dimension();
 		}

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

@@ -234,7 +234,7 @@ public class FlatSliderUI
 			return -1;
 
 		// use default font (instead of slider font) because the slider font size
-		// may be different to label font size, but we want align the track/thumb with labels
+		// may be different to label font size, but we want to align the track/thumb with labels
 		Font font = UIManager.getFont( "defaultFont" );
 		if( font == null )
 			font = slider.getFont();

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

@@ -293,9 +293,7 @@ public class FlatSpinnerUI
 			return true;
 
 		JTextField textField = getEditorTextField( spinner.getEditor() );
-		return (textField != null)
-			? FlatUIUtils.isPermanentFocusOwner( textField )
-			: false;
+		return textField != null && FlatUIUtils.isPermanentFocusOwner( textField );
 	}
 
 	protected Color getBackground( boolean enabled ) {
@@ -447,7 +445,7 @@ public class FlatSpinnerUI
 			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
+			// the arrow buttons width is the same as the inner height so that the arrow buttons area is square
 			int minimumWidth = FlatUIUtils.minimumWidth( spinner, FlatSpinnerUI.this.minimumWidth );
 			int innerHeight = editorSize.height + padding.top + padding.bottom;
 			float focusWidth = FlatUIUtils.getBorderFocusWidth( spinner );

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

@@ -359,7 +359,7 @@ public class FlatStylingSupport
 	 * @param key the name of the field
 	 * @param value the new value
 	 * @return the old value of the field
-	 * @throws UnknownStyleException if object does not have a annotated field with given name
+	 * @throws UnknownStyleException if object does not have an annotated field with given name
 	 * @throws IllegalArgumentException if value type does not fit to expected type
 	 */
 	public static Object applyToAnnotatedObject( Object obj, String key, Object value )
@@ -517,7 +517,7 @@ public class FlatStylingSupport
 	 * @param key the name of the field
 	 * @param value the new value
 	 * @return the old value of the field
-	 * @throws UnknownStyleException if object does not have a annotated field with given name
+	 * @throws UnknownStyleException if object does not have an annotated field with given name
 	 * @throws IllegalArgumentException if value type does not fit to expected type
 	 */
 	public static Object applyToAnnotatedObjectOrComponent( Object obj, Object comp, String key, Object value )

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

@@ -650,7 +650,7 @@ public class FlatTabbedPaneUI
 				case "tabIconPlacement": value = parseTabIconPlacement( (String) value ); break;
 			}
 		} else {
-			Object oldValue = null;
+			Object oldValue;
 			switch( key ) {
 				// BasicTabbedPaneUI
 				case "tabInsets": oldValue = tabInsets; tabInsets = (Insets) value; return oldValue;
@@ -1841,7 +1841,7 @@ public class FlatTabbedPaneUI
 			super( direction, arrowType,
 				FlatTabbedPaneUI.this.foreground, FlatTabbedPaneUI.this.disabledForeground,
 				null, buttonHoverBackground, null, buttonPressedBackground );
-			setArrowWidth( 10 );
+			setArrowWidth( 11 );
 		}
 
 		protected void updateStyle() {
@@ -1983,7 +1983,7 @@ public class FlatTabbedPaneUI
 		}
 
 		protected JMenuItem createTabMenuItem( int tabIndex ) {
-			// search for tab name in this places
+			// search for tab name in these places
 			//   1. tab title
 			//   2. text of label or text component in custom tab component (including children)
 			//   3. accessible name of tab
@@ -2016,7 +2016,7 @@ public class FlatTabbedPaneUI
 				menuItem.setOpaque( true );
 			}
 
-			if( !tabPane.isEnabledAt( tabIndex ) )
+			if( !tabPane.isEnabled() || !tabPane.isEnabledAt( tabIndex ) )
 				menuItem.setEnabled( false );
 
 			menuItem.addActionListener( e -> selectTab( tabIndex ) );
@@ -2412,7 +2412,7 @@ public class FlatTabbedPaneUI
 			if( tabPane == null || tabViewport == null )
 				return;
 
-			if( !scrolled || tabViewport == null )
+			if( !scrolled )
 				return;
 			scrolled = false;
 
@@ -2525,9 +2525,7 @@ public class FlatTabbedPaneUI
 			setRolloverTab( tabIndex );
 
 			// check whether mouse hit tab close area
-			boolean hitClose = isTabClosable( tabIndex )
-				? getTabCloseHitArea( tabIndex ).contains( x, y )
-				: false;
+			boolean hitClose = isTabClosable( tabIndex ) && getTabCloseHitArea( tabIndex ).contains( x, y );
 			if( e.getID() == MouseEvent.MOUSE_PRESSED )
 				pressedTabIndex = hitClose ? tabIndex : -1;
 			setRolloverTabClose( hitClose );
@@ -2550,8 +2548,7 @@ public class FlatTabbedPaneUI
 			if( tabIndex == lastTipTabIndex )
 				return; // closeTip already set
 
-			if( tabIndex != lastTipTabIndex )
-				restoreTabToolTip();
+			restoreTabToolTip();
 
 			lastTipTabIndex = tabIndex;
 			lastTip = tabPane.getToolTipTextAt( lastTipTabIndex );

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

@@ -72,7 +72,7 @@ public class FlatTableCellBorder
 	}
 
 	/**
-	 * Because this borders are always shared for all tables,
+	 * Because this border is always shared for all tables,
 	 * get border specific style from FlatTableUI.
 	 */
 	static <T> T getStyleFromTableUI( Component c, Function<FlatTableUI, T> f ) {

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

@@ -288,7 +288,7 @@ public class FlatTableUI
 	/**
 	 * Toggle selection colors from focused to inactive and vice versa.
 	 *
-	 * This is not a optimal solution but much easier than rewriting the whole paint methods.
+	 * This is not an optimal solution but much easier than rewriting the whole paint methods.
 	 *
 	 * Using a LaF specific renderer was avoided because often a custom renderer is
 	 * already used in applications. Then either the inactive colors are not used,

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

@@ -369,7 +369,7 @@ public class FlatTextFieldUI
 		if( !(oldBackground instanceof UIResource) )
 			return;
 
-		// do not update background if it currently has a unknown color (assigned from outside)
+		// do not update background if it currently has an unknown color (assigned from outside)
 		if( oldBackground != background &&
 			oldBackground != disabledBackground &&
 			oldBackground != inactiveBackground &&
@@ -610,7 +610,7 @@ debug*/
 	 * Returns the rectangle used to paint leading and trailing icons.
 	 * It invokes {@code super.getVisibleEditorRect()} and reduces left and/or
 	 * right margin if the text field has leading or trailing icons or components.
-	 * Also the preferred widths of leading and trailing components are removed.
+	 * Also, the preferred widths of leading and trailing components are removed.
 	 *
 	 * @since 2
 	 */

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

@@ -248,7 +248,7 @@ public class FlatTitlePane
 		if( rootPane.getWindowDecorationStyle() == JRootPane.FRAME ) {
 			// JRootPane.FRAME works only for frames (and not for dialogs)
 			// but at this time the owner window type is unknown (not yet added)
-			// so we add the iconify/maximize/restore buttons and they are shown
+			// so we add the iconify/maximize/restore buttons, and they are shown
 			// later in frameStateChanged(), which is invoked from addNotify()
 
 			buttonPanel.add( iconifyButton );
@@ -420,7 +420,7 @@ public class FlatTitlePane
 	}
 
 	/**
-	 * Returns whether this title pane currently has an visible and embedded menubar.
+	 * Returns whether this title pane currently has a visible and embedded menubar.
 	 */
 	protected boolean hasVisibleEmbeddedMenuBar( JMenuBar menuBar ) {
 		return menuBar != null && menuBar.isVisible() && isMenuBarEmbedded();
@@ -615,7 +615,7 @@ debug*/
 			int maximizedWidth = screenBounds.width;
 			int maximizedHeight = screenBounds.height;
 
-			if( !isMaximizedBoundsFixed() ) {
+			if( SystemInfo.isWindows && !isMaximizedBoundsFixed() ) {
 				// on Java 8 to 14, maximized x,y are 0,0 based on all screens in a multi-screen environment
 				maximizedX = 0;
 				maximizedY = 0;
@@ -772,7 +772,7 @@ debug*/
 				if( horizontalGlue != null ) {
 					// If menu bar is embedded and contains a horizontal glue component,
 					// then split the hit test spot into two spots so that
-					// the glue component area can used to move the window.
+					// the glue component area can be used to move the window.
 
 					Point glueLocation = SwingUtilities.convertPoint( horizontalGlue, 0, 0, window );
 					int x2 = glueLocation.x + horizontalGlue.getWidth();
@@ -883,9 +883,7 @@ debug*/
 		}
 
 		protected boolean isWindowMaximized( Component c ) {
-			return window instanceof Frame
-				? (((Frame)window).getExtendedState() & Frame.MAXIMIZED_BOTH) != 0
-				: false;
+			return window instanceof Frame && (((Frame) window).getExtendedState() & Frame.MAXIMIZED_BOTH) != 0;
 		}
 	}
 
@@ -911,7 +909,7 @@ debug*/
 			boolean center = hasEmbeddedMenuBar ? centerTitleIfMenuBarEmbedded : centerTitle;
 			if( center ) {
 				// If window is wide enough, center title within window bounds.
-				// Otherwise leave it centered within free space (label bounds).
+				// Otherwise, leave it centered within free space (label bounds).
 				int centeredTextX = ((l.getParent().getWidth() - textWidth) / 2) - l.getX();
 				if( centeredTextX >= gap && centeredTextX + textWidth <= labelWidth - gap )
 					textX = centeredTextX;

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

@@ -21,7 +21,6 @@ import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.beans.PropertyChangeEvent;
-import java.util.Iterator;
 import java.util.Map;
 import javax.swing.AbstractButton;
 import javax.swing.JComponent;
@@ -164,11 +163,7 @@ public class FlatToggleButtonUI
 	@Override
 	public Map<String, Class<?>> getStyleableInfos( JComponent c ) {
 		Map<String, Class<?>> infos = super.getStyleableInfos( c );
-		Iterator<String> it = infos.keySet().iterator();
-		while( it.hasNext() ) {
-			if( it.next().startsWith( "help." ) )
-				it.remove();
-		}
+		infos.keySet().removeIf( s -> s.startsWith( "help." ) );
 		return infos;
 	}
 

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

@@ -282,7 +282,7 @@ public class FlatToolBarUI
 			return comboBox.getUI().isFocusTraversable( comboBox );
 		}
 
-		// check whether component has a empty input map to skip components that
+		// check whether component has an empty input map to skip components that
 		// are focusable, but do nothing when focused (e.g. JLabel)
 		// see LayoutFocusTraversalPolicy.accept()
 		if( c instanceof JComponent ) {

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

@@ -71,7 +71,7 @@ public class FlatUIUtils
 	public static final boolean MAC_USE_QUARTZ = Boolean.getBoolean( "apple.awt.graphics.UseQuartz" );
 
 	private static boolean useSharedUIs = true;
-	private static WeakHashMap<LookAndFeel, IdentityHashMap<Object, ComponentUI>> sharedUIinstances = new WeakHashMap<>();
+	private static final WeakHashMap<LookAndFeel, IdentityHashMap<Object, ComponentUI>> sharedUIinstances = new WeakHashMap<>();
 
 	public static Rectangle addInsets( Rectangle r, Insets insets ) {
 		return new Rectangle(
@@ -777,8 +777,8 @@ public class FlatUIUtils
 	 *        {@link SwingConstants#WEST} or {@link SwingConstants#EAST})
 	 * @param chevron {@code true} for chevron arrow, {@code false} for triangle arrow
 	 * @param arrowSize the width of the painted arrow (for vertical direction) (will be scaled)
-	 * @param xOffset a offset added to the x coordinate of the arrow to paint it out-of-center. Usually zero. (will be scaled)
-	 * @param yOffset a offset added to the y coordinate of the arrow to paint it out-of-center. Usually zero. (will be scaled)
+	 * @param xOffset an offset added to the x coordinate of the arrow to paint it out-of-center. Usually zero. (will be scaled)
+	 * @param yOffset an offset added to the y coordinate of the arrow to paint it out-of-center. Usually zero. (will be scaled)
 	 *
 	 * @since 1.1
 	 */
@@ -786,13 +786,15 @@ public class FlatUIUtils
 		int direction, boolean chevron, int arrowSize, float xOffset, float yOffset )
 	{
 		// compute arrow width/height
-		int aw = UIScale.scale( arrowSize + (chevron ? 0 : 1) );
-		int ah = UIScale.scale( (arrowSize / 2) + (chevron ? 0 : 1) );
+		// - make chevron arrows one pixel smaller because coordinates are based on center of pixels (0.5/0.5)
+		// - make triangle arrows one pixel taller (and round height up) to make them look stronger
+		float aw = UIScale.scale( arrowSize + (chevron ? -1 : 0) );
+		float ah = chevron ? (aw / 2) : UIScale.scale( (arrowSize / 2) + 1 );
 
 		// rotate arrow width/height for horizontal directions
 		boolean vert = (direction == SwingConstants.NORTH || direction == SwingConstants.SOUTH);
 		if( !vert ) {
-			int temp = aw;
+			float temp = aw;
 			aw = ah;
 			ah = temp;
 		}
@@ -804,19 +806,19 @@ public class FlatUIUtils
 		// compute arrow location
 		float ox = ((width - (aw + extra)) / 2f) + UIScale.scale( xOffset );
 		float oy = ((height - (ah + extra)) / 2f) + UIScale.scale( yOffset );
-		int ax = x + ((direction == SwingConstants.WEST) ? -Math.round( -ox ) : Math.round( ox ));
-		int ay = y + ((direction == SwingConstants.NORTH) ? -Math.round( -oy ) : Math.round( oy ));
+		float ax = x + ((direction == SwingConstants.WEST) ? -Math.round( -(ox + aw) ) - aw : Math.round( ox ));
+		float ay = y + ((direction == SwingConstants.NORTH) ? -Math.round( -(oy + ah) ) - ah : Math.round( oy ));
 
 		// paint arrow
 		g.translate( ax, ay );
 /*debug
-		debugPaintArrow( g, Color.red, vert, aw + extra, ah + extra );
+		debugPaintArrow( g, Color.red, vert, Math.round( aw + extra ), Math.round( ah + extra ) );
 debug*/
 		Shape arrowShape = createArrowShape( direction, chevron, aw, ah );
 		if( chevron ) {
 			Stroke oldStroke = g.getStroke();
 			g.setStroke( new BasicStroke( UIScale.scale( 1f ) ) );
-			g.draw( arrowShape );
+			drawShapePure( g, arrowShape );
 			g.setStroke( oldStroke );
 		} else {
 			// triangle
@@ -828,7 +830,7 @@ debug*/
 	/**
 	 * Creates a chevron or triangle arrow shape for the given direction and size.
 	 * <p>
-	 * The chevron shape is a open path that can be painted with {@link Graphics2D#draw(Shape)}.
+	 * The chevron shape is an open path that can be painted with {@link Graphics2D#draw(Shape)}.
 	 * The triangle shape is a close path that can be painted with {@link Graphics2D#fill(Shape)}.
 	 *
 	 * @param direction the arrow direction ({@link SwingConstants#NORTH}, {@link SwingConstants#SOUTH}
@@ -880,7 +882,7 @@ debug*/
 	}
 
 	/**
-	 * Creates a open or closed path for the given points.
+	 * Creates an open or closed path for the given points.
 	 */
 	public static Path2D createPath( boolean close, double... points ) {
 		Path2D path = new Path2D.Float();
@@ -892,6 +894,23 @@ debug*/
 		return path;
 	}
 
+	/**
+	 * Draws the given shape with disabled stroke normalization.
+	 * The x/y coordinates of the shape are translated by a half pixel.
+	 *
+	 * @since 2.1
+	 */
+	public static void drawShapePure( Graphics2D g, Shape shape ) {
+		Object oldStrokeControl = g.getRenderingHint( RenderingHints.KEY_STROKE_CONTROL );
+		g.setRenderingHint( RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE );
+
+		g.translate( 0.5, 0.5 );
+		g.draw( shape );
+		g.translate( -0.5, -0.5 );
+
+		g.setRenderingHint( RenderingHints.KEY_STROKE_CONTROL, oldStrokeControl );
+	}
+
 	/**
 	 * Draws the given string at the specified location.
 	 * The provided component is used to query text properties and anti-aliasing hints.

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

@@ -23,6 +23,7 @@ import java.awt.Dialog;
 import java.awt.Dimension;
 import java.awt.Frame;
 import java.awt.Graphics;
+import java.awt.GraphicsConfiguration;
 import java.awt.Insets;
 import java.awt.Rectangle;
 import java.awt.Toolkit;
@@ -43,6 +44,7 @@ import javax.swing.JInternalFrame;
 import javax.swing.JLayeredPane;
 import javax.swing.JRootPane;
 import javax.swing.UIManager;
+import com.formdev.flatlaf.util.SystemInfo;
 import com.formdev.flatlaf.util.UIScale;
 
 /**
@@ -231,8 +233,15 @@ public abstract class FlatWindowResizer
 	{
 		protected Window window;
 
+		private final boolean limitResizeToScreenBounds;
+
 		public WindowResizer( JRootPane rootPane ) {
 			super( rootPane );
+
+			// On Linux, limit window resizing to screen bounds because otherwise
+			// there would be a strange effect when the mouse is moved over a sidebar
+			// while resizing and the opposite window side is also resized.
+			limitResizeToScreenBounds = SystemInfo.isLinux;
 		}
 
 		@Override
@@ -289,11 +298,19 @@ public abstract class FlatWindowResizer
 
 		@Override
 		protected boolean limitToParentBounds() {
-			return false;
+			return limitResizeToScreenBounds && window != null;
 		}
 
 		@Override
 		protected Rectangle getParentBounds() {
+			if( limitResizeToScreenBounds && window != null ) {
+				GraphicsConfiguration gc = window.getGraphicsConfiguration();
+				Rectangle bounds = gc.getBounds();
+				Insets insets = window.getToolkit().getScreenInsets( gc );
+				return new Rectangle( bounds.x + insets.left, bounds.y + insets.top,
+					bounds.width - insets.left - insets.right,
+					bounds.height - insets.top - insets.bottom );
+			}
 			return null;
 		}
 
@@ -385,7 +402,7 @@ public abstract class FlatWindowResizer
 
 		@Override
 		protected Rectangle getParentBounds() {
-			return getFrame().getParent().getBounds();
+			return new Rectangle( getFrame().getParent().getSize() );
 		}
 
 		@Override
@@ -579,8 +596,8 @@ debug*/
 			// top
 			if( resizeDir == N_RESIZE_CURSOR || resizeDir == NW_RESIZE_CURSOR || resizeDir == NE_RESIZE_CURSOR ) {
 				newBounds.y = yOnScreen - dragTopOffset;
-				if( limitToParentBounds() && newBounds.y < 0 )
-					newBounds.y = 0;
+				if( limitToParentBounds() )
+					newBounds.y = Math.max( newBounds.y, getParentBounds().y );
 				newBounds.height += (oldBounds.y - newBounds.y);
 			}
 
@@ -597,8 +614,8 @@ debug*/
 			// left
 			if( resizeDir == W_RESIZE_CURSOR || resizeDir == NW_RESIZE_CURSOR || resizeDir == SW_RESIZE_CURSOR ) {
 				newBounds.x = xOnScreen - dragLeftOffset;
-				if( limitToParentBounds() && newBounds.x < 0 )
-					newBounds.x = 0;
+				if( limitToParentBounds() )
+					newBounds.x = Math.max( newBounds.x, getParentBounds().x );
 				newBounds.width += (oldBounds.x - newBounds.x);
 			}
 

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

@@ -155,7 +155,7 @@ class FlatWindowsNativeWindowBorder
 	}
 
 	/**
-	 * Tell the window whether the application wants use custom decorations.
+	 * Tell the window whether the application wants to use custom decorations.
 	 * If {@code true}, the Windows 10 title bar is hidden (including minimize,
 	 * maximize and close buttons), but not the resize borders (including drop shadow).
 	 */

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

@@ -284,7 +284,7 @@ public class JBRCustomDecorations
 		@Override
 		public void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
 			Window window = SwingUtilities.windowForComponent( c );
-			boolean active = (window != null) ? window.isActive() : false;
+			boolean active = window != null && window.isActive();
 
 			// paint top border
 			//  - in light themes

flatlaf-core/src/main/java/com/formdev/flatlaf/util/AnimatedIcon.java

@@ -59,7 +59,7 @@ import com.formdev.flatlaf.util.Animator.Interpolator;
  * </pre>
  *
  * Animation works only if the component passed to {@link #paintIcon(Component, Graphics, int, int)}
- * is a instance of {@link JComponent}.
+ * is an instance of {@link JComponent}.
  * A client property is set on the component to store the animation state.
  *
  * @author Karl Tauber
@@ -68,7 +68,7 @@ public interface AnimatedIcon
 	extends Icon
 {
 	@Override
-	public default void paintIcon( Component c, Graphics g, int x, int y ) {
+	default void paintIcon( Component c, Graphics g, int x, int y ) {
 		AnimationSupport.paintIcon( this, c, g, x, y );
 	}
 

flatlaf-core/src/main/java/com/formdev/flatlaf/util/DerivedColor.java

@@ -47,7 +47,7 @@ public class DerivedColor
 		Color result = ColorFunctions.applyFunctions( baseColor, functions );
 
 		// if the result is equal to the default color, then the original base color
-		// was passed and we can cache this to avoid color calculations
+		// was passed, and we can cache this to avoid color calculations
 		if( !hasBaseOfDefaultColor && result.getRGB() == this.getRGB() ) {
 			hasBaseOfDefaultColor = true;
 			baseOfDefaultColorRGB = baseColor.getRGB();

flatlaf-core/src/main/java/com/formdev/flatlaf/util/HSLColor.java

@@ -76,7 +76,7 @@ public class HSLColor
 	}
 
 	/**
-	 *  Create a HSLColor object using an an array containing the
+	 *  Create a HSLColor object using an array containing the
 	 *  individual HSL values and with a default alpha value of 1.
 	 *
 	 *  @param hsl  array containing HSL values
@@ -87,7 +87,7 @@ public class HSLColor
 	}
 
 	/**
-	 *  Create a HSLColor object using an an array containing the
+	 *  Create a HSLColor object using an array containing the
 	 *  individual HSL values.
 	 *
 	 *  @param hsl  array containing HSL values
@@ -291,7 +291,7 @@ public class HSLColor
 
 		//  Calculate the Saturation
 
-		float s = 0;
+		float s;
 
 		if (max == min)
 			s = 0;
@@ -386,7 +386,7 @@ public class HSLColor
 		s /= 100f;
 		l /= 100f;
 
-		float q = 0;
+		float q;
 
 		if (l < 0.5)
 			q = l * (1 + s);

flatlaf-core/src/main/java/com/formdev/flatlaf/util/HiDPIUtils.java

@@ -31,7 +31,7 @@ import com.formdev.flatlaf.FlatSystemProperties;
 public class HiDPIUtils
 {
 	public interface Painter {
-		public void paint( Graphics2D g, int x, int y, int width, int height, double scaleFactor );
+		void paint( Graphics2D g, int x, int y, int width, int height, double scaleFactor );
 	}
 
 	public static void paintAtScale1x( Graphics2D g, JComponent c, Painter painter ) {
@@ -114,7 +114,7 @@ public class HiDPIUtils
 	 * painted too far down on some operating systems.
 	 * The higher the system scale factor is, the more.
 	 * <p>
-	 * This methods computes a correction value for the Y position.
+	 * This method computes a correction value for the Y position.
 	 */
 	public static float computeTextYCorrection( Graphics2D g ) {
 		if( !useTextYCorrection() || !SystemInfo.isWindows )

flatlaf-core/src/main/java/com/formdev/flatlaf/util/JavaCompatibility.java

@@ -89,7 +89,7 @@ public class JavaCompatibility
 					getClippedStringMethod = cls.getMethod( SystemInfo.isJava_9_orLater
 							? "getClippedString"
 							: "clipStringIfNecessary",
-						new Class[] { JComponent.class, FontMetrics.class, String.class, int.class } );
+						JComponent.class, FontMetrics.class, String.class, int.class );
 				} catch( Exception ex ) {
 					LoggingFacade.INSTANCE.logSevere( null, ex );
 					throw new RuntimeException( ex );

flatlaf-core/src/main/java/com/formdev/flatlaf/util/MultiResolutionImageSupport.java

@@ -72,7 +72,7 @@ public class MultiResolutionImageSupport
 	 * <p>
 	 * The given dimensions array is only used for {@link #getResolutionVariants(Image)}.
 	 * The producer function may be invoked with any dimension (that is not contained in 
-	 * dimensions array) and is expected to produce a image for the passed in dimension.
+	 * dimensions array) and is expected to produce an image for the passed in dimension.
 	 * 
 	 * @param baseImageIndex index of the base image in the dimensions array
 	 * @param dimensions dimensions of resolution variants (sorted by size; smallest first)
@@ -92,7 +92,7 @@ public class MultiResolutionImageSupport
 	 * for "disabled" state.  
 	 * 
 	 * @param image a multi-resolution image that is mapped using the given mapper function
-	 * @param mapper mapper function that maps a single resolution variant to a new image (e.g. applying an filter)
+	 * @param mapper mapper function that maps a single resolution variant to a new image (e.g. applying a filter)
 	 * @return a multi-resolution image on Java 9 or later; a mapped image on Java 8
 	 */
 	public static Image map( Image image, Function<Image, Image> mapper ) {
@@ -104,7 +104,7 @@ public class MultiResolutionImageSupport
 	 * <p>
 	 * If the given image is a multi-resolution image then invokes
 	 * {@code java.awt.image.MultiResolutionImage.getResolutionVariant(destImageWidth, destImageHeight)}.
-	 * Otherwise returns the given image.
+	 * Otherwise, returns the given image.
 	 */
 	public static Image getResolutionVariant( Image image, int destImageWidth, int destImageHeight ) {
 		return image;
@@ -115,7 +115,7 @@ public class MultiResolutionImageSupport
 	 * <p>
 	 * If the given image is a multi-resolution image then invokes
 	 * {@code java.awt.image.MultiResolutionImage.getResolutionVariants()}.
-	 * Otherwise returns a list containing only the given image.
+	 * Otherwise, returns a list containing only the given image.
 	 */
 	public static List<Image> getResolutionVariants( Image image ) {
 		return Collections.singletonList( image );

flatlaf-core/src/main/java/com/formdev/flatlaf/util/NativeLibrary.java

@@ -195,7 +195,7 @@ public class NativeLibrary
 			// for loaded native libraries, they will be deleted on next application startup.
 			// The default temporary directory may contain hundreds or thousands of files.
 			// To make searching for "marked for deletion" files as fast as possible,
-			// use a sub directory that contains only our temporary native libraries.
+			// use a subdirectory that contains only our temporary native libraries.
 			tmpdir += "\\flatlaf.temp";
 		}
 

flatlaf-core/src/main/java/com/formdev/flatlaf/util/UIScale.java

@@ -103,7 +103,7 @@ public class UIScale
 			// Java 9 and later supports per-monitor scaling
 			jreHiDPI = true;
 		} else if( SystemInfo.isJetBrainsJVM ) {
-			// IntelliJ IDEA ships its own JetBrains Java 8 JRE that may supports per-monitor scaling
+			// IntelliJ IDEA ships its own JetBrains Java 8 JRE that may support per-monitor scaling
 			// see com.intellij.ui.JreHiDpiUtil.isJreHiDPIEnabled()
 			try {
 				GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
@@ -411,7 +411,7 @@ public class UIScale
 	 * Scales the given dimension with the user scale factor.
 	 * <p>
 	 * If user scale factor is 1, then the given dimension is simply returned.
-	 * Otherwise a new instance of {@link Dimension} or {@link DimensionUIResource}
+	 * Otherwise, a new instance of {@link Dimension} or {@link DimensionUIResource}
 	 * is returned, depending on whether the passed dimension implements {@link UIResource}.
 	 */
 	public static Dimension scale( Dimension dimension ) {
@@ -427,7 +427,7 @@ public class UIScale
 	 * Scales the given insets with the user scale factor.
 	 * <p>
 	 * If user scale factor is 1, then the given insets is simply returned.
-	 * Otherwise a new instance of {@link Insets} or {@link InsetsUIResource}
+	 * Otherwise, a new instance of {@link Insets} or {@link InsetsUIResource}
 	 * is returned, depending on whether the passed dimension implements {@link UIResource}.
 	 */
 	public static Insets scale( Insets insets ) {

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

@@ -24,7 +24,7 @@
 #
 # NOTE: Avoid copying the whole content of this file to own properties files.
 #       This will make upgrading to newer FlatLaf versions complex and error-prone.
-#       Instead copy and modify only those properties that you need to alter.
+#       Instead, copy and modify only those properties that you need to alter.
 #
 
 # Colors and style mostly based on Darcula theme from IntelliJ IDEA Community Edition,

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

@@ -23,7 +23,7 @@
 #
 # NOTE: Avoid copying the whole content of this file to own properties files.
 #       This will make upgrading to newer FlatLaf versions complex and error-prone.
-#       Instead copy and modify only those properties that you need to alter.
+#       Instead, copy and modify only those properties that you need to alter.
 #
 
 # Colors and style mostly based on Darcula theme from IntelliJ IDEA Community Edition,
@@ -240,6 +240,7 @@ MenuBar.borderColor = $Separator.foreground
 #---- PasswordField ----
 
 PasswordField.capsLockIconColor = #ffffff64
+PasswordField.revealIconColor = @foreground
 
 
 #---- Popup ----
@@ -251,6 +252,7 @@ Popup.dropShadowOpacity = 0.25
 #---- PopupMenu ----
 
 PopupMenu.borderColor = tint(@background,17%)
+PopupMenu.hoverScrollArrowBackground = lighten(@background,5%)
 
 
 #---- ProgressBar ----
@@ -367,6 +369,6 @@ Tree.hash = lighten($Tree.background,5%)
 	focusable: false; \
 	toolbar.margin: 1,1,1,1; \
 	toolbar.spacingInsets: 1,1,1,1; \
-	toolbar.hoverBackground: fade(Actions.GreyInline,30%,lazy); \
-	toolbar.pressedBackground: fade(Actions.GreyInline,40%,lazy); \
-	toolbar.selectedBackground: fade(Actions.GreyInline,50%,lazy)
+	toolbar.hoverBackground: lighten($TextField.background,5%); \
+	toolbar.pressedBackground: lighten($TextField.background,10%); \
+	toolbar.selectedBackground: lighten($TextField.background,15%)

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

@@ -24,7 +24,7 @@
 #
 # NOTE: Avoid copying the whole content of this file to own properties files.
 #       This will make upgrading to newer FlatLaf versions complex and error-prone.
-#       Instead copy and modify only those properties that you need to alter.
+#       Instead, copy and modify only those properties that you need to alter.
 #
 
 # Colors and style mostly based on IntelliJ theme from IntelliJ IDEA Community Edition,

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

@@ -23,7 +23,7 @@
 #
 # NOTE: Avoid copying the whole content of this file to own properties files.
 #       This will make upgrading to newer FlatLaf versions complex and error-prone.
-#       Instead copy and modify only those properties that you need to alter.
+#       Instead, copy and modify only those properties that you need to alter.
 #
 
 #---- typography / fonts ----
@@ -487,7 +487,6 @@ PasswordField.showCapsLock = true
 PasswordField.showRevealButton = false
 PasswordField.capsLockIcon = com.formdev.flatlaf.icons.FlatCapsLockIcon
 PasswordField.revealIcon = com.formdev.flatlaf.icons.FlatRevealIcon
-PasswordField.revealIconColor = lazy(Actions.Grey)
 
 
 #---- Popup ----
@@ -501,6 +500,7 @@ Popup.dropShadowInsets = -4,-4,4,4
 PopupMenu.border = com.formdev.flatlaf.ui.FlatPopupMenuBorder
 PopupMenu.borderInsets = 4,1,4,1
 PopupMenu.background = @menuBackground
+PopupMenu.scrollArrowColor = @buttonArrowColor
 
 
 #---- PopupMenuSeparator ----
@@ -555,6 +555,7 @@ RootPane.honorDialogMinimumSizeOnResize = true
 #---- ScrollBar ----
 
 ScrollBar.width = 10
+ScrollBar.minimumButtonSize = 12,12
 ScrollBar.minimumThumbSize = 10,10
 ScrollBar.maximumThumbSize = 100000,100000
 ScrollBar.trackInsets = 0,0,0,0

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

@@ -23,7 +23,7 @@
 #
 # NOTE: Avoid copying the whole content of this file to own properties files.
 #       This will make upgrading to newer FlatLaf versions complex and error-prone.
-#       Instead copy and modify only those properties that you need to alter.
+#       Instead, copy and modify only those properties that you need to alter.
 #
 
 # Colors and style mostly based on IntelliJ theme from IntelliJ IDEA Community Edition,
@@ -247,6 +247,7 @@ MenuBar.borderColor = $Separator.foreground
 #---- PasswordField ----
 
 PasswordField.capsLockIconColor = #00000064
+PasswordField.revealIconColor = tint(@foreground,40%)
 
 
 #---- Popup ----
@@ -258,6 +259,7 @@ Popup.dropShadowOpacity = 0.15
 #---- PopupMenu ----
 
 PopupMenu.borderColor = shade(@background,28%)
+PopupMenu.hoverScrollArrowBackground = darken(@background,5%)
 
 
 #---- ProgressBar ----
@@ -374,6 +376,6 @@ Tree.hash = darken($Tree.background,10%)
 	focusable: false; \
 	toolbar.margin: 1,1,1,1; \
 	toolbar.spacingInsets: 1,1,1,1; \
-	toolbar.hoverBackground: fade(Actions.GreyInline,10%,lazy); \
-	toolbar.pressedBackground: fade(Actions.GreyInline,20%,lazy); \
-	toolbar.selectedBackground: fade(Actions.GreyInline,30%,lazy)
+	toolbar.hoverBackground: darken($TextField.background,4%); \
+	toolbar.pressedBackground: darken($TextField.background,8%); \
+	toolbar.selectedBackground: darken($TextField.background,12%)

flatlaf-core/src/main/resources/com/formdev/flatlaf/IntelliJTheme$ThemeLaf.properties

@@ -91,33 +91,33 @@ ToggleButton.endBackground = $ToggleButton.background
 @ijMenuCheckBackgroundL20 = lighten(@selectionBackground,20%,derived noAutoInverse)
 @ijMenuCheckBackgroundD10 = darken(@selectionBackground,10%,derived noAutoInverse)
 
-[Arc_Theme]CheckBoxMenuItem.foreground = lazy(MenuItem.foreground) 
-[Arc_Theme]PopupMenu.foreground = lazy(MenuItem.foreground) 
-[Arc_Theme]RadioButtonMenuItem.foreground = lazy(MenuItem.foreground) 
+[Arc_Theme]CheckBoxMenuItem.foreground = lazy(MenuItem.foreground)
+[Arc_Theme]PopupMenu.foreground = lazy(MenuItem.foreground)
+[Arc_Theme]RadioButtonMenuItem.foreground = lazy(MenuItem.foreground)
 [Arc_Theme]ProgressBar.selectionBackground = #000
 [Arc_Theme]ProgressBar.selectionForeground = #fff
 [Arc_Theme]List.selectionInactiveForeground = #fff
 [Arc_Theme]Table.selectionInactiveForeground = #fff
 [Arc_Theme]Tree.selectionInactiveForeground = #fff
 
-[Arc_Theme_-_Orange]CheckBoxMenuItem.foreground = lazy(MenuItem.foreground) 
-[Arc_Theme_-_Orange]PopupMenu.foreground = lazy(MenuItem.foreground) 
-[Arc_Theme_-_Orange]RadioButtonMenuItem.foreground = lazy(MenuItem.foreground) 
+[Arc_Theme_-_Orange]CheckBoxMenuItem.foreground = lazy(MenuItem.foreground)
+[Arc_Theme_-_Orange]PopupMenu.foreground = lazy(MenuItem.foreground)
+[Arc_Theme_-_Orange]RadioButtonMenuItem.foreground = lazy(MenuItem.foreground)
 [Arc_Theme_-_Orange]ProgressBar.selectionBackground = #000
 [Arc_Theme_-_Orange]ProgressBar.selectionForeground = #fff
 [Arc_Theme_-_Orange]List.selectionInactiveForeground = #fff
 [Arc_Theme_-_Orange]Table.selectionInactiveForeground = #fff
 [Arc_Theme_-_Orange]Tree.selectionInactiveForeground = #fff
 
-[Arc_Theme_Dark]CheckBoxMenuItem.foreground = lazy(MenuItem.foreground) 
-[Arc_Theme_Dark]PopupMenu.foreground = lazy(MenuItem.foreground) 
-[Arc_Theme_Dark]RadioButtonMenuItem.foreground = lazy(MenuItem.foreground) 
+[Arc_Theme_Dark]CheckBoxMenuItem.foreground = lazy(MenuItem.foreground)
+[Arc_Theme_Dark]PopupMenu.foreground = lazy(MenuItem.foreground)
+[Arc_Theme_Dark]RadioButtonMenuItem.foreground = lazy(MenuItem.foreground)
 [Arc_Theme_Dark]ProgressBar.selectionBackground = #ddd
 [Arc_Theme_Dark]ProgressBar.selectionForeground = #ddd
 
-[Arc_Theme_Dark_-_Orange]CheckBoxMenuItem.foreground = lazy(MenuItem.foreground) 
-[Arc_Theme_Dark_-_Orange]PopupMenu.foreground = lazy(MenuItem.foreground) 
-[Arc_Theme_Dark_-_Orange]RadioButtonMenuItem.foreground = lazy(MenuItem.foreground) 
+[Arc_Theme_Dark_-_Orange]CheckBoxMenuItem.foreground = lazy(MenuItem.foreground)
+[Arc_Theme_Dark_-_Orange]PopupMenu.foreground = lazy(MenuItem.foreground)
+[Arc_Theme_Dark_-_Orange]RadioButtonMenuItem.foreground = lazy(MenuItem.foreground)
 [Arc_Theme_Dark_-_Orange]ProgressBar.selectionBackground = #ddd
 [Arc_Theme_Dark_-_Orange]ProgressBar.selectionForeground = #fff
 
@@ -152,13 +152,17 @@ ToggleButton.endBackground = $ToggleButton.background
 
 [Hiberbee_Dark]TabbedPane.focusColor = #5A5A5A
 [Hiberbee_Dark]ToggleButton.selectedBackground = $ToggleButton.selectedBackground
-[Hiberbee_Dark]ToggleButton.selectedBackground = $ToggleButton.selectedBackground
 [Hiberbee_Dark]ToggleButton.toolbar.selectedBackground = $ToggleButton.toolbar.selectedBackground
 
 [High_contrast]ToggleButton.selectedBackground = #fff
 [High_contrast]ToggleButton.selectedForeground = #000
 [High_contrast]ToggleButton.disabledSelectedBackground = #444
 [High_contrast]ToggleButton.toolbar.selectedBackground = #fff
+[High_contrast][style]Button.inTextField = \
+	toolbar.hoverBackground: #444; \
+	toolbar.pressedBackground: #666; \
+	toolbar.selectedBackground: #fff
+[High_contrast][style]ToggleButton.inTextField = $[High_contrast][style]Button.inTextField
 
 [Light_Flat]TableHeader.background = #E5E5E9
 

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

@@ -422,6 +422,10 @@ public class TestFlatStyleableInfo
 		FlatPopupMenuUI ui = (FlatPopupMenuUI) c.getUI();
 
 		Map<String, Class<?>> expected = expectedMap(
+			"arrowType", String.class,
+			"scrollArrowColor", Color.class,
+			"hoverScrollArrowBackground", Color.class,
+
 			"borderInsets", Insets.class,
 			"borderColor", Color.class
 		);
@@ -539,6 +543,7 @@ public class TestFlatStyleableInfo
 			"maximumThumbSize", Dimension.class,
 			"allowsAbsolutePositioning", boolean.class,
 
+			"minimumButtonSize", Dimension.class,
 			"trackInsets", Insets.class,
 			"thumbInsets", Insets.class,
 			"trackArc", int.class,

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

@@ -565,6 +565,10 @@ public class TestFlatStyling
 		JPopupMenu c = new JPopupMenu();
 		FlatPopupMenuUI ui = (FlatPopupMenuUI) c.getUI();
 
+		ui.applyStyle( "arrowType: chevron" );
+		ui.applyStyle( "scrollArrowColor: #fff" );
+		ui.applyStyle( "hoverScrollArrowBackground: #fff" );
+
 		ui.applyStyle( "borderInsets: 1,2,3,4" );
 		ui.applyStyle( "borderColor: #fff" );
 
@@ -684,6 +688,7 @@ public class TestFlatStyling
 		ui.applyStyle( "maximumThumbSize: 1,2" );
 		ui.applyStyle( "allowsAbsolutePositioning: true" );
 
+		ui.applyStyle( "minimumButtonSize: 1,2" );
 		ui.applyStyle( "trackInsets: 1,2,3,4" );
 		ui.applyStyle( "thumbInsets: 1,2,3,4" );
 		ui.applyStyle( "trackArc: 5" );

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

@@ -464,6 +464,7 @@ class DemoFrame
 		JMenuItem projectViewMenuItem = new JMenuItem();
 		JMenuItem structureViewMenuItem = new JMenuItem();
 		JMenuItem propertiesViewMenuItem = new JMenuItem();
+		scrollingPopupMenu = new JMenu();
 		JMenuItem menuItem2 = new JMenuItem();
 		htmlMenuItem = new JMenuItem();
 		JRadioButtonMenuItem radioButtonMenuItem1 = new JRadioButtonMenuItem();
@@ -668,6 +669,12 @@ class DemoFrame
 				}
 				viewMenu.add(menu1);
 
+				//======== scrollingPopupMenu ========
+				{
+					scrollingPopupMenu.setText("Scrolling Popup Menu");
+				}
+				viewMenu.add(scrollingPopupMenu);
+
 				//---- menuItem2 ----
 				menuItem2.setText("Disabled Item");
 				menuItem2.setEnabled(false);
@@ -889,8 +896,17 @@ class DemoFrame
 		copyMenuItem.addActionListener( new DefaultEditorKit.CopyAction() );
 		pasteMenuItem.addActionListener( new DefaultEditorKit.PasteAction() );
 
-		if( FlatLaf.supportsNativeWindowDecorations() ) {
-			windowDecorationsCheckBoxMenuItem.setSelected( FlatLaf.isUseNativeWindowDecorations() );
+		scrollingPopupMenu.add( "Large menus are scrollable" );
+		scrollingPopupMenu.add( "Use mouse wheel to scroll" );
+		scrollingPopupMenu.add( "Or use up/down arrows at top/bottom" );
+		for( int i = 1; i <= 100; i++ )
+			scrollingPopupMenu.add( "Item " + i );
+
+		if( FlatLaf.supportsNativeWindowDecorations() || (SystemInfo.isLinux && JFrame.isDefaultLookAndFeelDecorated()) ) {
+			if( SystemInfo.isLinux )
+				unsupported( windowDecorationsCheckBoxMenuItem );
+			else
+				windowDecorationsCheckBoxMenuItem.setSelected( FlatLaf.isUseNativeWindowDecorations() );
 			menuBarEmbeddedCheckBoxMenuItem.setSelected( UIManager.getBoolean( "TitlePane.menuBarEmbedded" ) );
 			unifiedTitleBarMenuItem.setSelected( UIManager.getBoolean( "TitlePane.unifiedBackground" ) );
 			showTitleBarIconMenuItem.setSelected( UIManager.getBoolean( "TitlePane.showIcon" ) );
@@ -931,6 +947,7 @@ class DemoFrame
 
 	// JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
 	private JMenuItem exitMenuItem;
+	private JMenu scrollingPopupMenu;
 	private JMenuItem htmlMenuItem;
 	private JMenu fontMenu;
 	private JMenu optionsMenu;

flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.jfd

@@ -282,6 +282,13 @@ new FormModel {
 							addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "menuItemActionPerformed", true ) )
 						} )
 					} )
+					add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+						name: "scrollingPopupMenu"
+						"text": "Scrolling Popup Menu"
+						auxiliary() {
+							"JavaCodeGenerator.variableLocal": false
+						}
+					} )
 					add( new FormComponent( "javax.swing.JMenuItem" ) {
 						name: "menuItem2"
 						"text": "Disabled Item"

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

@@ -17,6 +17,8 @@
 package com.formdev.flatlaf.demo;
 
 import java.awt.Dimension;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
 import javax.swing.SwingUtilities;
 import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.extras.FlatInspector;
@@ -52,6 +54,13 @@ public class FlatLafDemo
 			System.setProperty( "apple.awt.application.appearance", "system" );
 		}
 
+		// Linux
+		if( SystemInfo.isLinux ) {
+			// enable custom window decorations
+			JFrame.setDefaultLookAndFeelDecorated( true );
+			JDialog.setDefaultLookAndFeelDecorated( true );
+		}
+
 		if( FlatLafDemo.screenshotsMode && !SystemInfo.isJava_9_orLater && System.getProperty( "flatlaf.uiScale" ) == null )
 			System.setProperty( "flatlaf.uiScale", "2x" );
 

flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatJidePopupMenuUI.java

@@ -20,7 +20,6 @@ import javax.swing.*;
 import javax.swing.plaf.ComponentUI;
 import com.formdev.flatlaf.ui.FlatPopupMenuUI;
 import com.jidesoft.plaf.LookAndFeelFactory;
-import com.jidesoft.plaf.basic.BasicJidePopupMenuUI;
 
 /**
  * Provides the Flat LaF UI delegate for {@link com.jidesoft.swing.JidePopupMenu}.
@@ -38,7 +37,9 @@ public class FlatJidePopupMenuUI
 
 	@Override
 	public Popup getPopup( JPopupMenu popupMenu, int x, int y ) {
-		Popup popup = BasicJidePopupMenuUI.addScrollPaneIfNecessary( popupMenu, x, y );
-		return popup == null ? super.getPopup( popupMenu, x, y ) : popup;
+		// not using BasicJidePopupMenuUI.addScrollPaneIfNecessary() anymore because
+		// FlatLaf supports menu scrolling that works better than JIDE menu scrolling
+		// (support mouse wheel scrolling, scales arrows)
+		return super.getPopup( popupMenu, x, y );
 	}
 }

flatlaf-swingx/README.md

@@ -4,7 +4,7 @@ FlatLaf addon for SwingX
 This addon for FlatLaf adds support for **some** widely used SwingX components.
 
 Many SwingX components that do not use UI delegates (e.g. `JXButton`, `JXLabel`,
-`JXList`, etc) work with FlatLaf without adaptation.
+`JXList`, `JXStatusBar`, etc) work with FlatLaf without adaptation.
 
 Following SwingX components, which use UI delegates, are currently supported by
 this addon:

flatlaf-swingx/src/main/java/com/formdev/flatlaf/swingx/ui/FlatTaskPaneUI.java

@@ -217,8 +217,8 @@ public class FlatTaskPaneUI
 			Graphics2D g2 = (Graphics2D) g;
 
 			// scale chevron size
-			float cw = scale( 6f );
-			float ch = scale( 3f );
+			float cw = scale( 7f );
+			float ch = scale( 3.5f );
 
 			// create arrow shape
 			int direction = group.isCollapsed() ? SwingConstants.SOUTH : SwingConstants.NORTH;
@@ -237,9 +237,9 @@ public class FlatTaskPaneUI
 
 			// paint
 			g2.translate( cx, cy );
-			g2.draw( arrowShape );
+			FlatUIUtils.drawShapePure( g2, arrowShape );
 			g2.translate( 0, offset );
-			g2.draw( arrowShape );
+			FlatUIUtils.drawShapePure( g2, arrowShape );
 			g2.translate( -cx, -(cy + offset) );
 		}
 

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

@@ -712,7 +712,7 @@ PasswordField.inactiveForeground #8c8c8c  HSL   0   0  55    javax.swing.plaf.Co
 PasswordField.margin           2,6,2,6    javax.swing.plaf.InsetsUIResource [UI]
 PasswordField.placeholderForeground #8c8c8c  HSL   0   0  55    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.revealIcon       [lazy] 16,16    com.formdev.flatlaf.icons.FlatRevealIcon [UI]
-PasswordField.revealIconColor  [lazy] #afb1b3  HSL 210   3  69    javax.swing.plaf.ColorUIResource [UI]
+PasswordField.revealIconColor  #bbbbbb  HSL   0   0  73    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.selectionBackground #4b6eaf  HSL 219  40  49    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.selectionForeground #bbbbbb  HSL   0   0  73    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.showCapsLock     true
@@ -737,6 +737,8 @@ PopupMenu.borderInsets         4,1,4,1    javax.swing.plaf.InsetsUIResource [UI]
 PopupMenu.consumeEventOnClose  false
 PopupMenu.font                 [active] $defaultFont [UI]
 PopupMenu.foreground           #bbbbbb  HSL   0   0  73    javax.swing.plaf.ColorUIResource [UI]
+PopupMenu.hoverScrollArrowBackground #484c4e  HSL 200   4  29    javax.swing.plaf.ColorUIResource [UI]
+PopupMenu.scrollArrowColor     #9b9b9b  HSL   0   0  61    javax.swing.plaf.ColorUIResource [UI]
 
 
 #---- PopupMenuSeparator ----
@@ -862,6 +864,7 @@ ScrollBar.hoverThumbColor      #6e767a  HSL 200   5  45    com.formdev.flatlaf.u
 ScrollBar.hoverThumbWithTrack  false
 ScrollBar.hoverTrackColor      #484c4f  HSL 206   5  30    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(4%)
 ScrollBar.maximumThumbSize     100000,100000    javax.swing.plaf.DimensionUIResource [UI]
+ScrollBar.minimumButtonSize    12,12    javax.swing.plaf.DimensionUIResource [UI]
 ScrollBar.minimumThumbSize     10,10    javax.swing.plaf.DimensionUIResource [UI]
 ScrollBar.pressedButtonBackground #54595c  HSL 203   5  35    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(10%)
 ScrollBar.pressedThumbColor    #7a8387  HSL 198   5  50    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(15%)
@@ -1425,12 +1428,12 @@ ViewportUI                     com.formdev.flatlaf.ui.FlatViewportUI
 #---- [style]Button ----
 
 [style]Button.clearButton      icon: com.formdev.flatlaf.icons.FlatClearIcon; focusable: false; toolbar.margin: 1,1,1,1; toolbar.spacingInsets: 1,1,1,1; toolbar.hoverBackground: null; toolbar.pressedBackground: null
-[style]Button.inTextField      focusable: false; toolbar.margin: 1,1,1,1; toolbar.spacingInsets: 1,1,1,1; toolbar.hoverBackground: fade(Actions.GreyInline,30%,lazy); toolbar.pressedBackground: fade(Actions.GreyInline,40%,lazy); toolbar.selectedBackground: fade(Actions.GreyInline,50%,lazy)
+[style]Button.inTextField      focusable: false; toolbar.margin: 1,1,1,1; toolbar.spacingInsets: 1,1,1,1; toolbar.hoverBackground: lighten($TextField.background,5%); toolbar.pressedBackground: lighten($TextField.background,10%); toolbar.selectedBackground: lighten($TextField.background,15%)
 
 
 #---- [style]ToggleButton ----
 
-[style]ToggleButton.inTextField focusable: false; toolbar.margin: 1,1,1,1; toolbar.spacingInsets: 1,1,1,1; toolbar.hoverBackground: fade(Actions.GreyInline,30%,lazy); toolbar.pressedBackground: fade(Actions.GreyInline,40%,lazy); toolbar.selectedBackground: fade(Actions.GreyInline,50%,lazy)
+[style]ToggleButton.inTextField focusable: false; toolbar.margin: 1,1,1,1; toolbar.spacingInsets: 1,1,1,1; toolbar.hoverBackground: lighten($TextField.background,5%); toolbar.pressedBackground: lighten($TextField.background,10%); toolbar.selectedBackground: lighten($TextField.background,15%)
 
 
 #---- [style]ToolBar ----

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

@@ -717,7 +717,7 @@ PasswordField.inactiveForeground #8c8c8c  HSL   0   0  55    javax.swing.plaf.Co
 PasswordField.margin           2,6,2,6    javax.swing.plaf.InsetsUIResource [UI]
 PasswordField.placeholderForeground #8c8c8c  HSL   0   0  55    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.revealIcon       [lazy] 16,16    com.formdev.flatlaf.icons.FlatRevealIcon [UI]
-PasswordField.revealIconColor  [lazy] #6e6e6e  HSL   0   0  43    javax.swing.plaf.ColorUIResource [UI]
+PasswordField.revealIconColor  #666666  HSL   0   0  40    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.selectionBackground #2675bf  HSL 209  67  45    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.selectionForeground #ffffff  HSL   0   0 100    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.showCapsLock     true
@@ -742,6 +742,8 @@ PopupMenu.borderInsets         4,1,4,1    javax.swing.plaf.InsetsUIResource [UI]
 PopupMenu.consumeEventOnClose  false
 PopupMenu.font                 [active] $defaultFont [UI]
 PopupMenu.foreground           #000000  HSL   0   0   0    javax.swing.plaf.ColorUIResource [UI]
+PopupMenu.hoverScrollArrowBackground #e5e5e5  HSL   0   0  90    javax.swing.plaf.ColorUIResource [UI]
+PopupMenu.scrollArrowColor     #666666  HSL   0   0  40    javax.swing.plaf.ColorUIResource [UI]
 
 
 #---- PopupMenuSeparator ----
@@ -867,6 +869,7 @@ ScrollBar.hoverThumbColor      #c3c3c3  HSL   0   0  76    com.formdev.flatlaf.u
 ScrollBar.hoverThumbWithTrack  false
 ScrollBar.hoverTrackColor      #ededed  HSL   0   0  93    com.formdev.flatlaf.util.DerivedColor [UI]    darken(3%)
 ScrollBar.maximumThumbSize     100000,100000    javax.swing.plaf.DimensionUIResource [UI]
+ScrollBar.minimumButtonSize    12,12    javax.swing.plaf.DimensionUIResource [UI]
 ScrollBar.minimumThumbSize     10,10    javax.swing.plaf.DimensionUIResource [UI]
 ScrollBar.pressedButtonBackground #d9d9d9  HSL   0   0  85    com.formdev.flatlaf.util.DerivedColor [UI]    darken(10%)
 ScrollBar.pressedThumbColor    #a9a9a9  HSL   0   0  66    com.formdev.flatlaf.util.DerivedColor [UI]    darken(20%)
@@ -1430,12 +1433,12 @@ ViewportUI                     com.formdev.flatlaf.ui.FlatViewportUI
 #---- [style]Button ----
 
 [style]Button.clearButton      icon: com.formdev.flatlaf.icons.FlatClearIcon; focusable: false; toolbar.margin: 1,1,1,1; toolbar.spacingInsets: 1,1,1,1; toolbar.hoverBackground: null; toolbar.pressedBackground: null
-[style]Button.inTextField      focusable: false; toolbar.margin: 1,1,1,1; toolbar.spacingInsets: 1,1,1,1; toolbar.hoverBackground: fade(Actions.GreyInline,10%,lazy); toolbar.pressedBackground: fade(Actions.GreyInline,20%,lazy); toolbar.selectedBackground: fade(Actions.GreyInline,30%,lazy)
+[style]Button.inTextField      focusable: false; toolbar.margin: 1,1,1,1; toolbar.spacingInsets: 1,1,1,1; toolbar.hoverBackground: darken($TextField.background,4%); toolbar.pressedBackground: darken($TextField.background,8%); toolbar.selectedBackground: darken($TextField.background,12%)
 
 
 #---- [style]ToggleButton ----
 
-[style]ToggleButton.inTextField focusable: false; toolbar.margin: 1,1,1,1; toolbar.spacingInsets: 1,1,1,1; toolbar.hoverBackground: fade(Actions.GreyInline,10%,lazy); toolbar.pressedBackground: fade(Actions.GreyInline,20%,lazy); toolbar.selectedBackground: fade(Actions.GreyInline,30%,lazy)
+[style]ToggleButton.inTextField focusable: false; toolbar.margin: 1,1,1,1; toolbar.spacingInsets: 1,1,1,1; toolbar.hoverBackground: darken($TextField.background,4%); toolbar.pressedBackground: darken($TextField.background,8%); toolbar.selectedBackground: darken($TextField.background,12%)
 
 
 #---- [style]ToolBar ----

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

@@ -727,7 +727,7 @@ PasswordField.inactiveForeground #000088  HSL 240 100  27    javax.swing.plaf.Co
 PasswordField.margin           2,6,2,6    javax.swing.plaf.InsetsUIResource [UI]
 PasswordField.placeholderForeground #000088  HSL 240 100  27    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.revealIcon       [lazy] 16,16    com.formdev.flatlaf.icons.FlatRevealIcon [UI]
-PasswordField.revealIconColor  [lazy] #6e6e6e  HSL   0   0  43    javax.swing.plaf.ColorUIResource [UI]
+PasswordField.revealIconColor  #0000ff  HSL 240 100  50    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.selectionBackground #00aa00  HSL 120 100  33    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.selectionForeground #ffff00  HSL  60 100  50    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.showCapsLock     true
@@ -752,6 +752,8 @@ PopupMenu.borderInsets         4,1,4,1    javax.swing.plaf.InsetsUIResource [UI]
 PopupMenu.consumeEventOnClose  false
 PopupMenu.font                 [active] $defaultFont [UI]
 PopupMenu.foreground           #ff0000  HSL   0 100  50    javax.swing.plaf.ColorUIResource [UI]
+PopupMenu.hoverScrollArrowBackground #00ff00  HSL 120 100  50    javax.swing.plaf.ColorUIResource [UI]
+PopupMenu.scrollArrowColor     #0000ff  HSL 240 100  50    javax.swing.plaf.ColorUIResource [UI]
 
 
 #---- PopupMenuSeparator ----
@@ -874,6 +876,7 @@ ScrollBar.hoverThumbColor      #ff0000  HSL   0 100  50    javax.swing.plaf.Colo
 ScrollBar.hoverThumbWithTrack  false
 ScrollBar.hoverTrackColor      #00ff00  HSL 120 100  50    javax.swing.plaf.ColorUIResource [UI]
 ScrollBar.maximumThumbSize     100000,100000    javax.swing.plaf.DimensionUIResource [UI]
+ScrollBar.minimumButtonSize    12,12    javax.swing.plaf.DimensionUIResource [UI]
 ScrollBar.minimumThumbSize     10,10    javax.swing.plaf.DimensionUIResource [UI]
 ScrollBar.pressedThumbWithTrack false
 ScrollBar.showButtons          false

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

@@ -80,13 +80,24 @@ public class FlatMenusTest
 		FlatLaf.updateUI();
 	}
 
-	private void showPopupMenuButtonActionPerformed(ActionEvent e) {
+	private void showPopupMenuButton(ActionEvent e) {
 		Component invoker = (Component) e.getSource();
 		PopupMenu popupMenu = new PopupMenu();
 		popupMenu.applyComponentOrientation( getComponentOrientation() );
 		popupMenu.show( invoker, 0, invoker.getHeight() );
 	}
 
+	private void showScrollingPopupMenu(ActionEvent e) {
+		Component invoker = (Component) e.getSource();
+		JPopupMenu popupMenu = new JPopupMenu();
+		for( int i = 1; i <= 100; i++ ) {
+			popupMenu.add( "menu item " + i + (i % 5 == 0 ? " test" : "") )
+				.addActionListener( e2 -> System.out.println( ((JMenuItem)e2.getSource()).getText() ) );
+		}
+		popupMenu.applyComponentOrientation( getComponentOrientation() );
+		popupMenu.show( invoker, 0, invoker.getHeight() );
+	}
+
 	private void largerChanged() {
 		LargerMenuItem.useLargerSize = largerCheckBox.isSelected();
 		menuBar2.revalidate();
@@ -230,6 +241,7 @@ public class FlatMenusTest
 		JRadioButtonMenuItem radioButtonMenuItem11 = new JRadioButtonMenuItem();
 		JLabel popupMenuLabel = new JLabel();
 		JButton showPopupMenuButton = new JButton();
+		showScrollingPopupMenuButton = new JButton();
 		armedCheckBox = new JCheckBox();
 		underlineCheckBox = new JCheckBox();
 		popupMenubackgroundCheckBox = new JCheckBox();
@@ -839,9 +851,14 @@ public class FlatMenusTest
 
 		//---- showPopupMenuButton ----
 		showPopupMenuButton.setText("show JPopupMenu");
-		showPopupMenuButton.addActionListener(e -> showPopupMenuButtonActionPerformed(e));
+		showPopupMenuButton.addActionListener(e -> showPopupMenuButton(e));
 		add(showPopupMenuButton, "cell 1 2");
 
+		//---- showScrollingPopupMenuButton ----
+		showScrollingPopupMenuButton.setText("show scrolling JPopupMenu");
+		showScrollingPopupMenuButton.addActionListener(e -> showScrollingPopupMenu(e));
+		add(showScrollingPopupMenuButton, "cell 2 2");
+
 		//---- armedCheckBox ----
 		armedCheckBox.setText("armed");
 		armedCheckBox.setMnemonic('A');
@@ -884,6 +901,7 @@ public class FlatMenusTest
 	private JMenuBar menuBar2;
 	private JCheckBox largerCheckBox;
 	private JCheckBox accelCheckBox;
+	private JButton showScrollingPopupMenuButton;
 	private JCheckBox armedCheckBox;
 	private JCheckBox underlineCheckBox;
 	private JCheckBox popupMenubackgroundCheckBox;

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

@@ -629,10 +629,20 @@ new FormModel {
 			add( new FormComponent( "javax.swing.JButton" ) {
 				name: "showPopupMenuButton"
 				"text": "show JPopupMenu"
-				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "showPopupMenuButtonActionPerformed", true ) )
+				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "showPopupMenuButton", true ) )
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 2"
 			} )
+			add( new FormComponent( "javax.swing.JButton" ) {
+				name: "showScrollingPopupMenuButton"
+				"text": "show scrolling JPopupMenu"
+				auxiliary() {
+					"JavaCodeGenerator.variableLocal": false
+				}
+				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "showScrollingPopupMenu", true ) )
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 2 2"
+			} )
 			add( new FormComponent( "javax.swing.JCheckBox" ) {
 				name: "armedCheckBox"
 				"text": "armed"

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

@@ -673,7 +673,7 @@ public class FlatPaintingTest
 					panel5.add(arrowSizeLabel, "cell 0 2");
 
 					//---- arrowSizeSpinner ----
-					arrowSizeSpinner.setModel(new SpinnerNumberModel(8, 2, null, 1));
+					arrowSizeSpinner.setModel(new SpinnerNumberModel(9, 2, null, 1));
 					arrowSizeSpinner.addChangeListener(e -> arrowSizeChanged());
 					panel5.add(arrowSizeSpinner, "cell 1 2");
 

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

@@ -564,7 +564,7 @@ new FormModel {
 							name: "arrowSizeSpinner"
 							"model": new javax.swing.SpinnerNumberModel {
 								minimum: 2
-								value: 8
+								value: 9
 							}
 							auxiliary() {
 								"JavaCodeGenerator.variableLocal": false

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

@@ -0,0 +1,622 @@
+/*
+ * Copyright 2022 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.testing;
+
+import java.awt.Component;
+import java.awt.event.*;
+import javax.swing.*;
+import net.miginfocom.swing.*;
+
+/**
+ * @author Karl Tauber
+ */
+public class FlatSubMenusTest
+	extends FlatTestPanel
+{
+	public static void main( String[] args ) {
+		SwingUtilities.invokeLater( () -> {
+			FlatTestFrame frame = FlatTestFrame.create( args, "FlatSubMenusTest" );
+			UIManager.put( "FlatLaf.debug.menu.showSafeTriangle", true );
+			frame.applyComponentOrientationToFrame = true;
+			frame.showFrame( FlatSubMenusTest::new, panel -> ((FlatSubMenusTest)panel).menuBar );
+		} );
+	}
+
+	FlatSubMenusTest() {
+		initComponents();
+	}
+
+	private void showPopupMenuButtonActionPerformed(ActionEvent e) {
+		Component invoker = (Component) e.getSource();
+		PopupMenu popupMenu = new PopupMenu();
+		popupMenu.applyComponentOrientation( getComponentOrientation() );
+		popupMenu.show( invoker, 0, invoker.getHeight() );
+	}
+
+	private void initComponents() {
+		// JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
+		JButton showPopupMenuButton = new JButton();
+		menuBar = new JMenuBar();
+		JMenu menu3 = new JMenu();
+		JMenuItem menuItem1 = new JMenuItem();
+		JMenuItem menuItem50 = new JMenuItem();
+		JMenu menu4 = new JMenu();
+		JMenuItem menuItem9 = new JMenuItem();
+		JMenuItem menuItem10 = new JMenuItem();
+		JMenuItem menuItem11 = new JMenuItem();
+		JMenu menu8 = new JMenu();
+		JMenu menu21 = new JMenu();
+		JMenuItem menuItem81 = new JMenuItem();
+		JMenuItem menuItem82 = new JMenuItem();
+		JMenuItem menuItem83 = new JMenuItem();
+		JMenuItem menuItem41 = new JMenuItem();
+		JMenuItem menuItem42 = new JMenuItem();
+		JMenuItem menuItem43 = new JMenuItem();
+		JMenuItem menuItem44 = new JMenuItem();
+		JMenuItem menuItem45 = new JMenuItem();
+		JMenuItem menuItem46 = new JMenuItem();
+		JMenuItem menuItem12 = new JMenuItem();
+		JMenuItem menuItem13 = new JMenuItem();
+		JMenuItem menuItem14 = new JMenuItem();
+		JMenuItem menuItem2 = new JMenuItem();
+		JMenu menu5 = new JMenu();
+		JMenuItem menuItem15 = new JMenuItem();
+		JMenuItem menuItem16 = new JMenuItem();
+		JMenuItem menuItem17 = new JMenuItem();
+		JMenuItem menuItem18 = new JMenuItem();
+		JMenuItem menuItem19 = new JMenuItem();
+		JMenuItem menuItem20 = new JMenuItem();
+		JMenuItem menuItem21 = new JMenuItem();
+		JMenuItem menuItem22 = new JMenuItem();
+		JMenuItem menuItem23 = new JMenuItem();
+		JMenuItem menuItem24 = new JMenuItem();
+		JMenuItem menuItem25 = new JMenuItem();
+		JMenuItem menuItem26 = new JMenuItem();
+		JMenuItem menuItem27 = new JMenuItem();
+		JMenuItem menuItem28 = new JMenuItem();
+		JMenuItem menuItem29 = new JMenuItem();
+		JMenu menu6 = new JMenu();
+		JMenuItem menuItem30 = new JMenuItem();
+		JMenuItem menuItem31 = new JMenuItem();
+		JMenuItem menuItem32 = new JMenuItem();
+		JMenu menu9 = new JMenu();
+		JMenuItem menuItem47 = new JMenuItem();
+		JMenuItem menuItem48 = new JMenuItem();
+		JMenuItem menuItem49 = new JMenuItem();
+		JMenuItem menuItem33 = new JMenuItem();
+		JMenuItem menuItem34 = new JMenuItem();
+		JMenuItem menuItem3 = new JMenuItem();
+		JMenuItem menuItem4 = new JMenuItem();
+		JMenuItem menuItem5 = new JMenuItem();
+		JMenuItem menuItem6 = new JMenuItem();
+		JMenuItem menuItem7 = new JMenuItem();
+		JMenuItem menuItem8 = new JMenuItem();
+		JMenu menu7 = new JMenu();
+		JMenuItem menuItem35 = new JMenuItem();
+		JMenuItem menuItem37 = new JMenuItem();
+		JMenuItem menuItem36 = new JMenuItem();
+		JMenuItem menuItem38 = new JMenuItem();
+		JMenuItem menuItem39 = new JMenuItem();
+		JMenuItem menuItem40 = new JMenuItem();
+
+		//======== this ========
+		setLayout(new MigLayout(
+			"ltr,insets dialog,hidemode 3",
+			// columns
+			"[]",
+			// rows
+			"[]"));
+
+		//---- showPopupMenuButton ----
+		showPopupMenuButton.setText("show JPopupMenu");
+		showPopupMenuButton.addActionListener(e -> showPopupMenuButtonActionPerformed(e));
+		add(showPopupMenuButton, "cell 0 0");
+
+		//======== menuBar ========
+		{
+
+			//======== menu3 ========
+			{
+				menu3.setText("main menu");
+
+				//---- menuItem1 ----
+				menuItem1.setText("text");
+				menu3.add(menuItem1);
+
+				//---- menuItem50 ----
+				menuItem50.setText("text");
+				menu3.add(menuItem50);
+
+				//======== menu4 ========
+				{
+					menu4.setText("text");
+
+					//---- menuItem9 ----
+					menuItem9.setText("text");
+					menu4.add(menuItem9);
+
+					//---- menuItem10 ----
+					menuItem10.setText("text text");
+					menu4.add(menuItem10);
+
+					//---- menuItem11 ----
+					menuItem11.setText("text");
+					menu4.add(menuItem11);
+
+					//======== menu8 ========
+					{
+						menu8.setText("text");
+
+						//======== menu21 ========
+						{
+							menu21.setText("text");
+
+							//---- menuItem81 ----
+							menuItem81.setText("text");
+							menu21.add(menuItem81);
+
+							//---- menuItem82 ----
+							menuItem82.setText("text");
+							menu21.add(menuItem82);
+
+							//---- menuItem83 ----
+							menuItem83.setText("text");
+							menu21.add(menuItem83);
+						}
+						menu8.add(menu21);
+
+						//---- menuItem41 ----
+						menuItem41.setText("text");
+						menu8.add(menuItem41);
+
+						//---- menuItem42 ----
+						menuItem42.setText("text");
+						menu8.add(menuItem42);
+
+						//---- menuItem43 ----
+						menuItem43.setText("text");
+						menu8.add(menuItem43);
+
+						//---- menuItem44 ----
+						menuItem44.setText("text");
+						menu8.add(menuItem44);
+
+						//---- menuItem45 ----
+						menuItem45.setText("text");
+						menu8.add(menuItem45);
+
+						//---- menuItem46 ----
+						menuItem46.setText("text");
+						menu8.add(menuItem46);
+					}
+					menu4.add(menu8);
+
+					//---- menuItem12 ----
+					menuItem12.setText("text");
+					menu4.add(menuItem12);
+
+					//---- menuItem13 ----
+					menuItem13.setText("text");
+					menu4.add(menuItem13);
+
+					//---- menuItem14 ----
+					menuItem14.setText("text");
+					menu4.add(menuItem14);
+				}
+				menu3.add(menu4);
+
+				//---- menuItem2 ----
+				menuItem2.setText("text");
+				menu3.add(menuItem2);
+
+				//======== menu5 ========
+				{
+					menu5.setText("text");
+
+					//---- menuItem15 ----
+					menuItem15.setText("text bla bla");
+					menu5.add(menuItem15);
+
+					//---- menuItem16 ----
+					menuItem16.setText("text");
+					menu5.add(menuItem16);
+
+					//---- menuItem17 ----
+					menuItem17.setText("text");
+					menu5.add(menuItem17);
+
+					//---- menuItem18 ----
+					menuItem18.setText("text");
+					menu5.add(menuItem18);
+
+					//---- menuItem19 ----
+					menuItem19.setText("text");
+					menu5.add(menuItem19);
+
+					//---- menuItem20 ----
+					menuItem20.setText("text");
+					menu5.add(menuItem20);
+
+					//---- menuItem21 ----
+					menuItem21.setText("text");
+					menu5.add(menuItem21);
+
+					//---- menuItem22 ----
+					menuItem22.setText("text");
+					menu5.add(menuItem22);
+
+					//---- menuItem23 ----
+					menuItem23.setText("text");
+					menu5.add(menuItem23);
+
+					//---- menuItem24 ----
+					menuItem24.setText("text");
+					menu5.add(menuItem24);
+
+					//---- menuItem25 ----
+					menuItem25.setText("text");
+					menu5.add(menuItem25);
+
+					//---- menuItem26 ----
+					menuItem26.setText("text");
+					menu5.add(menuItem26);
+
+					//---- menuItem27 ----
+					menuItem27.setText("text");
+					menu5.add(menuItem27);
+
+					//---- menuItem28 ----
+					menuItem28.setText("text");
+					menu5.add(menuItem28);
+
+					//---- menuItem29 ----
+					menuItem29.setText("text");
+					menu5.add(menuItem29);
+				}
+				menu3.add(menu5);
+
+				//======== menu6 ========
+				{
+					menu6.setText("text");
+
+					//---- menuItem30 ----
+					menuItem30.setText("text o text");
+					menu6.add(menuItem30);
+
+					//---- menuItem31 ----
+					menuItem31.setText("text");
+					menu6.add(menuItem31);
+
+					//---- menuItem32 ----
+					menuItem32.setText("text");
+					menu6.add(menuItem32);
+
+					//======== menu9 ========
+					{
+						menu9.setText("text");
+
+						//---- menuItem47 ----
+						menuItem47.setText("text");
+						menu9.add(menuItem47);
+
+						//---- menuItem48 ----
+						menuItem48.setText("text");
+						menu9.add(menuItem48);
+
+						//---- menuItem49 ----
+						menuItem49.setText("text");
+						menu9.add(menuItem49);
+					}
+					menu6.add(menu9);
+
+					//---- menuItem33 ----
+					menuItem33.setText("text");
+					menu6.add(menuItem33);
+
+					//---- menuItem34 ----
+					menuItem34.setText("text");
+					menu6.add(menuItem34);
+				}
+				menu3.add(menu6);
+
+				//---- menuItem3 ----
+				menuItem3.setText("text");
+				menu3.add(menuItem3);
+
+				//---- menuItem4 ----
+				menuItem4.setText("longer text");
+				menu3.add(menuItem4);
+
+				//---- menuItem5 ----
+				menuItem5.setText("text");
+				menu3.add(menuItem5);
+
+				//---- menuItem6 ----
+				menuItem6.setText("text");
+				menu3.add(menuItem6);
+
+				//---- menuItem7 ----
+				menuItem7.setText("text");
+				menu3.add(menuItem7);
+
+				//---- menuItem8 ----
+				menuItem8.setText("text");
+				menu3.add(menuItem8);
+
+				//======== menu7 ========
+				{
+					menu7.setText("text");
+
+					//---- menuItem35 ----
+					menuItem35.setText("text abc");
+					menu7.add(menuItem35);
+
+					//---- menuItem37 ----
+					menuItem37.setText("text");
+					menu7.add(menuItem37);
+
+					//---- menuItem36 ----
+					menuItem36.setText("text");
+					menu7.add(menuItem36);
+
+					//---- menuItem38 ----
+					menuItem38.setText("text");
+					menu7.add(menuItem38);
+
+					//---- menuItem39 ----
+					menuItem39.setText("text");
+					menu7.add(menuItem39);
+
+					//---- menuItem40 ----
+					menuItem40.setText("text");
+					menu7.add(menuItem40);
+				}
+				menu3.add(menu7);
+			}
+			menuBar.add(menu3);
+		}
+		// JFormDesigner - End of component initialization  //GEN-END:initComponents
+	}
+
+	// JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
+	private JMenuBar menuBar;
+	// JFormDesigner - End of variables declaration  //GEN-END:variables
+
+	//---- class PopupMenu ----------------------------------------------------
+
+	private class PopupMenu extends JPopupMenu {
+		private PopupMenu() {
+			initComponents();
+		}
+
+		private void initComponents() {
+			// JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
+			JMenuItem menuItem54 = new JMenuItem();
+			JMenuItem menuItem51 = new JMenuItem();
+			JMenu menu10 = new JMenu();
+			JMenuItem menuItem57 = new JMenuItem();
+			JMenuItem menuItem58 = new JMenuItem();
+			JMenu menu14 = new JMenu();
+			JMenu menu18 = new JMenu();
+			JMenu menu19 = new JMenu();
+			JMenuItem menuItem76 = new JMenuItem();
+			JMenuItem menuItem77 = new JMenuItem();
+			JMenuItem menuItem78 = new JMenuItem();
+			JMenu menu20 = new JMenu();
+			JMenuItem menuItem73 = new JMenuItem();
+			JMenuItem menuItem74 = new JMenuItem();
+			JMenuItem menuItem75 = new JMenuItem();
+			JMenuItem menuItem79 = new JMenuItem();
+			JMenuItem menuItem80 = new JMenuItem();
+			JMenuItem menuItem70 = new JMenuItem();
+			JMenuItem menuItem71 = new JMenuItem();
+			JMenuItem menuItem72 = new JMenuItem();
+			JMenuItem menuItem59 = new JMenuItem();
+			JMenuItem menuItem60 = new JMenuItem();
+			JMenuItem menuItem52 = new JMenuItem();
+			JMenu menu11 = new JMenu();
+			JMenuItem menuItem61 = new JMenuItem();
+			JMenuItem menuItem62 = new JMenuItem();
+			JMenuItem menuItem63 = new JMenuItem();
+			JMenu menu12 = new JMenu();
+			JMenuItem menuItem64 = new JMenuItem();
+			JMenuItem menuItem65 = new JMenuItem();
+			JMenuItem menuItem66 = new JMenuItem();
+			JMenuItem menuItem53 = new JMenuItem();
+			JMenuItem menuItem55 = new JMenuItem();
+			JMenuItem menuItem56 = new JMenuItem();
+			JMenu menu13 = new JMenu();
+			JMenuItem menuItem67 = new JMenuItem();
+			JMenuItem menuItem68 = new JMenuItem();
+			JMenuItem menuItem69 = new JMenuItem();
+
+			//======== this ========
+
+			//---- menuItem54 ----
+			menuItem54.setText("text");
+			add(menuItem54);
+
+			//---- menuItem51 ----
+			menuItem51.setText("text text");
+			add(menuItem51);
+
+			//======== menu10 ========
+			{
+				menu10.setText("text");
+
+				//---- menuItem57 ----
+				menuItem57.setText("text");
+				menu10.add(menuItem57);
+
+				//---- menuItem58 ----
+				menuItem58.setText("text");
+				menu10.add(menuItem58);
+
+				//======== menu14 ========
+				{
+					menu14.setText("text");
+
+					//======== menu18 ========
+					{
+						menu18.setText("text");
+
+						//======== menu19 ========
+						{
+							menu19.setText("text");
+
+							//---- menuItem76 ----
+							menuItem76.setText("text");
+							menu19.add(menuItem76);
+
+							//---- menuItem77 ----
+							menuItem77.setText("text");
+							menu19.add(menuItem77);
+
+							//---- menuItem78 ----
+							menuItem78.setText("text");
+							menu19.add(menuItem78);
+						}
+						menu18.add(menu19);
+
+						//======== menu20 ========
+						{
+							menu20.setText("text");
+
+							//---- menuItem73 ----
+							menuItem73.setText("text");
+							menu20.add(menuItem73);
+
+							//---- menuItem74 ----
+							menuItem74.setText("text");
+							menu20.add(menuItem74);
+
+							//---- menuItem75 ----
+							menuItem75.setText("text");
+							menu20.add(menuItem75);
+						}
+						menu18.add(menu20);
+
+						//---- menuItem79 ----
+						menuItem79.setText("text");
+						menu18.add(menuItem79);
+
+						//---- menuItem80 ----
+						menuItem80.setText("text");
+						menu18.add(menuItem80);
+					}
+					menu14.add(menu18);
+
+					//---- menuItem70 ----
+					menuItem70.setText("text");
+					menu14.add(menuItem70);
+
+					//---- menuItem71 ----
+					menuItem71.setText("text");
+					menu14.add(menuItem71);
+
+					//---- menuItem72 ----
+					menuItem72.setText("text");
+					menu14.add(menuItem72);
+				}
+				menu10.add(menu14);
+
+				//---- menuItem59 ----
+				menuItem59.setText("text");
+				menu10.add(menuItem59);
+
+				//---- menuItem60 ----
+				menuItem60.setText("text");
+				menu10.add(menuItem60);
+			}
+			add(menu10);
+
+			//---- menuItem52 ----
+			menuItem52.setText("text");
+			add(menuItem52);
+
+			//======== menu11 ========
+			{
+				menu11.setText("text");
+
+				//---- menuItem61 ----
+				menuItem61.setText("text");
+				menu11.add(menuItem61);
+
+				//---- menuItem62 ----
+				menuItem62.setText("text");
+				menu11.add(menuItem62);
+
+				//---- menuItem63 ----
+				menuItem63.setText("text");
+				menu11.add(menuItem63);
+			}
+			add(menu11);
+
+			//======== menu12 ========
+			{
+				menu12.setText("text");
+
+				//---- menuItem64 ----
+				menuItem64.setText("text");
+				menu12.add(menuItem64);
+
+				//---- menuItem65 ----
+				menuItem65.setText("text");
+				menu12.add(menuItem65);
+
+				//---- menuItem66 ----
+				menuItem66.setText("text");
+				menu12.add(menuItem66);
+			}
+			add(menu12);
+
+			//---- menuItem53 ----
+			menuItem53.setText("text");
+			add(menuItem53);
+
+			//---- menuItem55 ----
+			menuItem55.setText("text");
+			add(menuItem55);
+
+			//---- menuItem56 ----
+			menuItem56.setText("text");
+			add(menuItem56);
+
+			//======== menu13 ========
+			{
+				menu13.setText("text");
+
+				//---- menuItem67 ----
+				menuItem67.setText("text");
+				menu13.add(menuItem67);
+
+				//---- menuItem68 ----
+				menuItem68.setText("text");
+				menu13.add(menuItem68);
+
+				//---- menuItem69 ----
+				menuItem69.setText("text");
+				menu13.add(menuItem69);
+			}
+			add(menu13);
+			// JFormDesigner - End of component initialization  //GEN-END:initComponents
+		}
+
+		// JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
+		// JFormDesigner - End of variables declaration  //GEN-END:variables
+	}
+}

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

@@ -0,0 +1,439 @@
+JFDML JFormDesigner: "7.0.5.0.404" Java: "17" encoding: "UTF-8"
+
+new FormModel {
+	contentType: "form/swing"
+	root: new FormRoot {
+		auxiliary() {
+			"JavaCodeGenerator.defaultVariableLocal": true
+		}
+		add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
+			"$layoutConstraints": "ltr,insets dialog,hidemode 3"
+			"$columnConstraints": "[]"
+			"$rowConstraints": "[]"
+		} ) {
+			name: "this"
+			add( new FormComponent( "javax.swing.JButton" ) {
+				name: "showPopupMenuButton"
+				"text": "show JPopupMenu"
+				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "showPopupMenuButtonActionPerformed", true ) )
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 0 0"
+			} )
+		}, new FormLayoutConstraints( null ) {
+			"location": new java.awt.Point( 0, 0 )
+			"size": new java.awt.Dimension( 390, 130 )
+		} )
+		add( new FormContainer( "javax.swing.JMenuBar", new FormLayoutManager( class javax.swing.JMenuBar ) ) {
+			name: "menuBar"
+			auxiliary() {
+				"JavaCodeGenerator.variableLocal": false
+			}
+			add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+				name: "menu3"
+				"text": "main menu"
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem1"
+					"text": "text"
+				} )
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem50"
+					"text": "text"
+				} )
+				add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+					name: "menu4"
+					"text": "text"
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem9"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem10"
+						"text": "text text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem11"
+						"text": "text"
+					} )
+					add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+						name: "menu8"
+						"text": "text"
+						add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+							name: "menu21"
+							"text": "text"
+							add( new FormComponent( "javax.swing.JMenuItem" ) {
+								name: "menuItem81"
+								"text": "text"
+							} )
+							add( new FormComponent( "javax.swing.JMenuItem" ) {
+								name: "menuItem82"
+								"text": "text"
+							} )
+							add( new FormComponent( "javax.swing.JMenuItem" ) {
+								name: "menuItem83"
+								"text": "text"
+							} )
+						} )
+						add( new FormComponent( "javax.swing.JMenuItem" ) {
+							name: "menuItem41"
+							"text": "text"
+						} )
+						add( new FormComponent( "javax.swing.JMenuItem" ) {
+							name: "menuItem42"
+							"text": "text"
+						} )
+						add( new FormComponent( "javax.swing.JMenuItem" ) {
+							name: "menuItem43"
+							"text": "text"
+						} )
+						add( new FormComponent( "javax.swing.JMenuItem" ) {
+							name: "menuItem44"
+							"text": "text"
+						} )
+						add( new FormComponent( "javax.swing.JMenuItem" ) {
+							name: "menuItem45"
+							"text": "text"
+						} )
+						add( new FormComponent( "javax.swing.JMenuItem" ) {
+							name: "menuItem46"
+							"text": "text"
+						} )
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem12"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem13"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem14"
+						"text": "text"
+					} )
+				} )
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem2"
+					"text": "text"
+				} )
+				add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+					name: "menu5"
+					"text": "text"
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem15"
+						"text": "text bla bla"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem16"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem17"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem18"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem19"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem20"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem21"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem22"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem23"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem24"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem25"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem26"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem27"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem28"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem29"
+						"text": "text"
+					} )
+				} )
+				add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+					name: "menu6"
+					"text": "text"
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem30"
+						"text": "text o text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem31"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem32"
+						"text": "text"
+					} )
+					add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+						name: "menu9"
+						"text": "text"
+						add( new FormComponent( "javax.swing.JMenuItem" ) {
+							name: "menuItem47"
+							"text": "text"
+						} )
+						add( new FormComponent( "javax.swing.JMenuItem" ) {
+							name: "menuItem48"
+							"text": "text"
+						} )
+						add( new FormComponent( "javax.swing.JMenuItem" ) {
+							name: "menuItem49"
+							"text": "text"
+						} )
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem33"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem34"
+						"text": "text"
+					} )
+				} )
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem3"
+					"text": "text"
+				} )
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem4"
+					"text": "longer text"
+				} )
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem5"
+					"text": "text"
+				} )
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem6"
+					"text": "text"
+				} )
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem7"
+					"text": "text"
+				} )
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem8"
+					"text": "text"
+				} )
+				add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+					name: "menu7"
+					"text": "text"
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem35"
+						"text": "text abc"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem37"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem36"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem38"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem39"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem40"
+						"text": "text"
+					} )
+				} )
+			} )
+		}, new FormLayoutConstraints( null ) {
+			"location": new java.awt.Point( 0, 175 )
+		} )
+		add( new FormContainer( "javax.swing.JPopupMenu", new FormLayoutManager( class javax.swing.JPopupMenu ) ) {
+			name: "popupMenu1"
+			auxiliary() {
+				"JavaCodeGenerator.className": "PopupMenu"
+			}
+			add( new FormComponent( "javax.swing.JMenuItem" ) {
+				name: "menuItem54"
+				"text": "text"
+			} )
+			add( new FormComponent( "javax.swing.JMenuItem" ) {
+				name: "menuItem51"
+				"text": "text text"
+			} )
+			add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+				name: "menu10"
+				"text": "text"
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem57"
+					"text": "text"
+				} )
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem58"
+					"text": "text"
+				} )
+				add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+					name: "menu14"
+					"text": "text"
+					add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+						name: "menu18"
+						"text": "text"
+						add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+							name: "menu19"
+							"text": "text"
+							add( new FormComponent( "javax.swing.JMenuItem" ) {
+								name: "menuItem76"
+								"text": "text"
+							} )
+							add( new FormComponent( "javax.swing.JMenuItem" ) {
+								name: "menuItem77"
+								"text": "text"
+							} )
+							add( new FormComponent( "javax.swing.JMenuItem" ) {
+								name: "menuItem78"
+								"text": "text"
+							} )
+						} )
+						add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+							name: "menu20"
+							"text": "text"
+							add( new FormComponent( "javax.swing.JMenuItem" ) {
+								name: "menuItem73"
+								"text": "text"
+							} )
+							add( new FormComponent( "javax.swing.JMenuItem" ) {
+								name: "menuItem74"
+								"text": "text"
+							} )
+							add( new FormComponent( "javax.swing.JMenuItem" ) {
+								name: "menuItem75"
+								"text": "text"
+							} )
+						} )
+						add( new FormComponent( "javax.swing.JMenuItem" ) {
+							name: "menuItem79"
+							"text": "text"
+						} )
+						add( new FormComponent( "javax.swing.JMenuItem" ) {
+							name: "menuItem80"
+							"text": "text"
+						} )
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem70"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem71"
+						"text": "text"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "menuItem72"
+						"text": "text"
+					} )
+				} )
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem59"
+					"text": "text"
+				} )
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem60"
+					"text": "text"
+				} )
+			} )
+			add( new FormComponent( "javax.swing.JMenuItem" ) {
+				name: "menuItem52"
+				"text": "text"
+			} )
+			add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+				name: "menu11"
+				"text": "text"
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem61"
+					"text": "text"
+				} )
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem62"
+					"text": "text"
+				} )
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem63"
+					"text": "text"
+				} )
+			} )
+			add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+				name: "menu12"
+				"text": "text"
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem64"
+					"text": "text"
+				} )
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem65"
+					"text": "text"
+				} )
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem66"
+					"text": "text"
+				} )
+			} )
+			add( new FormComponent( "javax.swing.JMenuItem" ) {
+				name: "menuItem53"
+				"text": "text"
+			} )
+			add( new FormComponent( "javax.swing.JMenuItem" ) {
+				name: "menuItem55"
+				"text": "text"
+			} )
+			add( new FormComponent( "javax.swing.JMenuItem" ) {
+				name: "menuItem56"
+				"text": "text"
+			} )
+			add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+				name: "menu13"
+				"text": "text"
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem67"
+					"text": "text"
+				} )
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem68"
+					"text": "text"
+				} )
+				add( new FormComponent( "javax.swing.JMenuItem" ) {
+					name: "menuItem69"
+					"text": "text"
+				} )
+			} )
+		}, new FormLayoutConstraints( null ) {
+			"location": new java.awt.Point( 275, 175 )
+		} )
+	}
+}

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/screenshots/FlatScreenshotsBackground.java

@@ -24,6 +24,7 @@ import javax.swing.JFrame;
 import javax.swing.KeyStroke;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
+import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.FlatDarkLaf;
 import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.FlatLightLaf;
@@ -56,20 +57,22 @@ public class FlatScreenshotsBackground
 			black.setOpaque( false );
 			black.setVerticalAlignment( SwingConstants.TOP );
 			black.addActionListener( e -> {
-				if( black.isSelected() ) {
+				if( black.isSelected() )
 					FlatDarkLaf.setup();
-					FlatLaf.updateUI();
-					frame.getContentPane().setBackground( Color.black );
-				} else {
+				else
 					FlatLightLaf.setup();
-					FlatLaf.updateUI();
-					frame.getContentPane().setBackground( Color.white );
-				}
+				FlatLaf.updateUI();
+
+				Color color = black.isSelected() ? Color.black : Color.white;
+				frame.getContentPane().setBackground( color );
+				frame.getRootPane().putClientProperty( FlatClientProperties.TITLE_BAR_BACKGROUND, color );
 				frame.repaint();
 			} );
 			frame.getContentPane().add( black );
 
 			frame.getContentPane().setBackground( Color.white );
+			frame.getRootPane().putClientProperty( FlatClientProperties.TITLE_BAR_BACKGROUND, Color.white );
+
 			frame.setExtendedState( JFrame.MAXIMIZED_BOTH );
 			frame.setVisible( true );
 		} );

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/swingx/FlatSwingXTest.java

@@ -62,6 +62,13 @@ public class FlatSwingXTest
 		monthView1.setUnselectableDates( calendar.getTime() );
 
 		table.setDefaultEditor( Date.class, new DatePickerCellEditor() );
+
+		// status bar
+		statusBar1.add( new JLabel( "Ready" ), new JXStatusBar.Constraint( 100 ) );
+		statusBar1.add( new JLabel( "0 files loaded" ), new JXStatusBar.Constraint( 100 ) );
+		JProgressBar statusProgressBar = new JProgressBar();
+		statusProgressBar.setValue( 50 );
+		statusBar1.add( statusProgressBar, new JXStatusBar.Constraint( JXStatusBar.Constraint.ResizeBehavior.FILL ) );
 	}
 
 	private void busyChanged() {
@@ -129,6 +136,8 @@ public class FlatSwingXTest
 		JXSearchField xSearchField2 = new JXSearchField();
 		JXSearchField xSearchField3 = new JXSearchField();
 		JXSearchField xSearchField4 = new JXSearchField();
+		JLabel label12 = new JLabel();
+		statusBar1 = new JXStatusBar();
 		JButton button1 = new JButton();
 		JButton button2 = new JButton();
 
@@ -153,6 +162,7 @@ public class FlatSwingXTest
 			"[]" +
 			"[]" +
 			"[]" +
+			"[]" +
 			"[37]"));
 
 		//---- label1 ----
@@ -456,6 +466,11 @@ public class FlatSwingXTest
 		xSearchField4.setText("abc");
 		add(xSearchField4, "cell 2 10,growx");
 
+		//---- label12 ----
+		label12.setText("JXStatusBar:");
+		add(label12, "cell 0 11");
+		add(statusBar1, "cell 1 11 3 1,grow");
+
 		//---- button1 ----
 		button1.setText("<");
 
@@ -476,5 +491,6 @@ public class FlatSwingXTest
 	private JXBusyLabel xBusyLabel2;
 	private JCheckBox busyCheckBox;
 	private JTable table;
+	private JXStatusBar statusBar1;
 	// JFormDesigner - End of variables declaration  //GEN-END:variables
 }

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/swingx/FlatSwingXTest.jfd

@@ -1,4 +1,4 @@
-JFDML JFormDesigner: "7.0.4.0.360" Java: "16" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.5.0.404" Java: "17" encoding: "UTF-8"
 
 new FormModel {
 	contentType: "form/swing"
@@ -9,7 +9,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": "[left][][][][fill]"
-			"$rowConstraints": "[]0[][]0[top][][][][][][][][37]"
+			"$rowConstraints": "[]0[][]0[top][][][][][][][][][37]"
 		} ) {
 			name: "this"
 			add( new FormComponent( "javax.swing.JLabel" ) {
@@ -388,9 +388,23 @@ new FormModel {
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 2 10,growx"
 			} )
+			add( new FormComponent( "javax.swing.JLabel" ) {
+				name: "label12"
+				"text": "JXStatusBar:"
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 0 11"
+			} )
+			add( new FormComponent( "org.jdesktop.swingx.JXStatusBar" ) {
+				name: "statusBar1"
+				auxiliary() {
+					"JavaCodeGenerator.variableLocal": false
+				}
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 1 11 3 1,grow"
+			} )
 		}, new FormLayoutConstraints( null ) {
 			"location": new java.awt.Point( 0, 0 )
-			"size": new java.awt.Dimension( 700, 600 )
+			"size": new java.awt.Dimension( 795, 600 )
 		} )
 		add( new FormComponent( "javax.swing.JButton" ) {
 			name: "button1"

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

@@ -263,6 +263,7 @@ OptionPane.icon.foreground = #fff
 #---- PasswordField ----
 
 PasswordField.focusedBackground = #ff8
+PasswordField.revealIconColor = #00f
 
 
 #---- Popup ----
@@ -275,6 +276,8 @@ Popup.dropShadowInsets = -6,6,6,6
 #---- PopupMenu ----
 
 PopupMenu.borderColor = #00f
+PopupMenu.scrollArrowColor = #00f
+PopupMenu.hoverScrollArrowBackground = #0f0
 
 
 #---- PopupMenuSeparator ----

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

@@ -575,6 +575,8 @@ PopupMenu.borderInsets
 PopupMenu.consumeEventOnClose
 PopupMenu.font
 PopupMenu.foreground
+PopupMenu.hoverScrollArrowBackground
+PopupMenu.scrollArrowColor
 PopupMenu.selectedWindowInputMapBindings
 PopupMenu.selectedWindowInputMapBindings.RightToLeft
 PopupMenuSeparator.height
@@ -658,6 +660,7 @@ ScrollBar.hoverThumbColor
 ScrollBar.hoverThumbWithTrack
 ScrollBar.hoverTrackColor
 ScrollBar.maximumThumbSize
+ScrollBar.minimumButtonSize
 ScrollBar.minimumThumbSize
 ScrollBar.pressedButtonBackground
 ScrollBar.pressedThumbColor