Windows 11: made rounded popup border configurable via UI properties and client property

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

@@ -268,6 +268,25 @@ public interface FlatClientProperties
 
 	//---- Popup --------------------------------------------------------------
 
+	/**
+	 * Specifies the popup border corner radius if the component is shown in a popup
+	 * or if the component is the owner of another component that is shown in a popup.
+	 * <p>
+	 * Note that this is not available on all platforms since it requires special support.
+	 * Supported platforms:
+	 * <p>
+	 * <strong>Windows 11</strong> (x86 or x86_64): Only two corner radiuses are supported
+	 * by the OS: {@code DWMWCP_ROUND} is 8px and {@code DWMWCP_ROUNDSMALL} is 4px.
+	 * If this value is {@code 1 - 4}, then {@code DWMWCP_ROUNDSMALL} is used.
+	 * If it is {@code >= 5}, then {@code DWMWCP_ROUND} is used.
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JComponent}<br>
+	 * <strong>Value type</strong> {@link java.lang.Integer}<br>
+	 *
+	 * @since 3.1
+	 */
+	String POPUP_BORDER_CORNER_RADIUS = "Popup.borderCornerRadius";
+
 	/**
 	 * Specifies whether a drop shadow is painted if the component is shown in a popup
 	 * or if the component is the owner of another component that is shown in a popup.

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

@@ -43,6 +43,7 @@ import java.lang.reflect.Method;
 import javax.swing.JComponent;
 import javax.swing.JLayeredPane;
 import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
 import javax.swing.JToolTip;
 import javax.swing.JWindow;
 import javax.swing.Popup;
@@ -54,6 +55,7 @@ import javax.swing.UIManager;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.LineBorder;
+import javax.swing.plaf.basic.BasicComboPopup;
 import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.util.SystemInfo;
 import com.formdev.flatlaf.util.UIScale;
@@ -91,10 +93,13 @@ public class FlatPopupFactory
 			return new NonFlashingPopup( getPopupForScreenOfOwner( owner, contents, x, y, true ), contents );
 
 		// Windows 11 with FlatLaf native library can use rounded corners and shows drop shadow for heavy weight popups
-		if( SystemInfo.isWindows_11_orLater && FlatNativeWindowsLibrary.isLoaded() ) {
+		int borderCornerRadius;
+		if( isWindows11BorderSupported() &&
+			(borderCornerRadius = getBorderCornerRadius( owner, contents )) > 0 )
+		{
 			NonFlashingPopup popup = new NonFlashingPopup( getPopupForScreenOfOwner( owner, contents, x, y, true ), contents );
 			if( popup.popupWindow != null )
-				setupWindows11Border( popup.popupWindow, contents );
+				setupWindows11Border( popup.popupWindow, contents, borderCornerRadius );
 			return popup;
 		}
 
@@ -176,19 +181,39 @@ public class FlatPopupFactory
 	}
 
 	private boolean isOptionEnabled( Component owner, Component contents, String clientKey, String uiKey ) {
-		if( owner instanceof JComponent ) {
-			Boolean b = FlatClientProperties.clientPropertyBooleanStrict( (JComponent) owner, clientKey, null );
-			if( b != null )
-				return b;
+		Object value = getOption( owner, contents, clientKey, uiKey );
+		return (value instanceof Boolean) ? (Boolean) value : false;
+	}
+
+	private int getBorderCornerRadius( Component owner, Component contents ) {
+		String uiKey =
+			(contents instanceof BasicComboPopup) ? "ComboBox.borderCornerRadius" :
+			(contents instanceof JPopupMenu) ? "PopupMenu.borderCornerRadius" :
+			(contents instanceof JToolTip) ? "ToolTip.borderCornerRadius" :
+			"Popup.borderCornerRadius";
+
+		Object value = getOption( owner, contents, FlatClientProperties.POPUP_BORDER_CORNER_RADIUS, uiKey );
+		return (value instanceof Integer) ? (Integer) value : 0;
+	}
+
+	/**
+	 * Get option from:
+	 * <ol>
+	 * <li>client property {@code clientKey} of {@code owner}
+	 * <li>client property {@code clientKey} of {@code contents}
+	 * <li>UI property {@code uiKey}
+	 * </ol>
+	 */
+	private Object getOption( Component owner, Component contents, String clientKey, String uiKey ) {
+		for( Component c : new Component[] { owner, contents } ) {
+			if( c instanceof JComponent ) {
+				Object value = ((JComponent)c).getClientProperty( clientKey );
+				if( value != null )
+					return value;
+			}
 		}
 
-		if( contents instanceof JComponent ) {
-			Boolean b = FlatClientProperties.clientPropertyBooleanStrict( (JComponent) contents, clientKey, null );
-			if( b != null )
-				return b;
-		}
-
-		return UIManager.getBoolean( uiKey );
+		return UIManager.get( uiKey );
 	}
 
 	/**
@@ -310,7 +335,11 @@ public class FlatPopupFactory
 			((JComponent)owner).getToolTipLocation( me ) != null;
 	}
 
-	private static void setupWindows11Border( Window popupWindow, Component contents ) {
+	private static boolean isWindows11BorderSupported() {
+		return SystemInfo.isWindows_11_orLater && FlatNativeWindowsLibrary.isLoaded();
+	}
+
+	private static void setupWindows11Border( Window popupWindow, Component contents, int borderCornerRadius ) {
 		// make sure that the Windows 11 window is created
 		if( !popupWindow.isDisplayable() )
 			popupWindow.addNotify();
@@ -319,7 +348,10 @@ public class FlatPopupFactory
 		long hwnd = FlatNativeWindowsLibrary.getHWND( popupWindow );
 
 		// set corner preference
-		FlatNativeWindowsLibrary.setWindowCornerPreference( hwnd, FlatNativeWindowsLibrary.DWMWCP_ROUNDSMALL );
+		int cornerPreference = (borderCornerRadius <= 4)
+			? FlatNativeWindowsLibrary.DWMWCP_ROUNDSMALL  // 4px
+			: FlatNativeWindowsLibrary.DWMWCP_ROUND;      // 8px
+		FlatNativeWindowsLibrary.setWindowCornerPreference( hwnd, cornerPreference );
 
 		// set border color
 		int red = -1; // use system default color
@@ -347,6 +379,16 @@ public class FlatPopupFactory
 		FlatNativeWindowsLibrary.setWindowBorderColor( hwnd, red, green, blue );
 	}
 
+	private static void resetWindows11Border( Window popupWindow ) {
+		// get window handle
+		long hwnd = FlatNativeWindowsLibrary.getHWND( popupWindow );
+		if( hwnd == 0 )
+			return;
+
+		// reset corner preference
+		FlatNativeWindowsLibrary.setWindowCornerPreference( hwnd, FlatNativeWindowsLibrary.DWMWCP_DONOTROUND );
+	}
+
 	//---- class NonFlashingPopup ---------------------------------------------
 
 	private class NonFlashingPopup
@@ -478,6 +520,14 @@ public class FlatPopupFactory
 					oldDropShadowWindowBackground = dropShadowWindow.getBackground();
 					dropShadowWindow.setBackground( new Color( 0, true ) );
 				}
+
+				// Windows 11: reset corner preference on reused heavy weight popups
+				if( isWindows11BorderSupported() ) {
+					resetWindows11Border( popupWindow );
+					if( dropShadowWindow != null )
+						resetWindows11Border( dropShadowWindow );
+				}
+
 			} else {
 				mediumWeightPanel = (Panel) SwingUtilities.getAncestorOfClass( Panel.class, contents );
 				if( mediumWeightPanel != null ) {

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

@@ -67,6 +67,7 @@ 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.FlatClientProperties;
 import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
 import com.formdev.flatlaf.util.LoggingFacade;
@@ -297,6 +298,9 @@ public class FlatPopupMenuUI
 			popup.addMenuKeyListener( this );
 
 			updateArrowButtons();
+
+			putClientProperty( FlatClientProperties.POPUP_BORDER_CORNER_RADIUS,
+				UIManager.getInt( "PopupMenu.borderCornerRadius" ) );
 		}
 
 		void scroll( int unitsToScroll ) {

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

@@ -288,6 +288,7 @@ ComboBox.buttonPressedArrowColor = @buttonPressedArrowColor
 ComboBox.popupInsets = 0,0,0,0
 ComboBox.selectionInsets = 0,0,0,0
 ComboBox.selectionArc = 0
+ComboBox.borderCornerRadius = $Popup.borderCornerRadius
 
 
 #---- Component ----
@@ -503,6 +504,7 @@ PasswordField.revealIcon = com.formdev.flatlaf.icons.FlatRevealIcon
 
 #---- Popup ----
 
+Popup.borderCornerRadius = 4
 Popup.dropShadowPainted = true
 Popup.dropShadowInsets = -4,-4,4,4
 
@@ -511,6 +513,7 @@ Popup.dropShadowInsets = -4,-4,4,4
 
 PopupMenu.border = com.formdev.flatlaf.ui.FlatPopupMenuBorder
 PopupMenu.borderInsets = 4,1,4,1
+PopupMenu.borderCornerRadius = $Popup.borderCornerRadius
 PopupMenu.background = @menuBackground
 PopupMenu.scrollArrowColor = @buttonArrowColor
 
@@ -880,6 +883,11 @@ ToolBar.spacingBorder = $Button.toolbar.spacingInsets
 ToolTipManager.enableToolTipMode = activeApplication
 
 
+#---- ToolTip ----
+
+ToolTip.borderCornerRadius = $Popup.borderCornerRadius
+
+
 #---- Tree ----
 
 Tree.border = 1,1,1,1

flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacDarkLaf.properties

@@ -149,6 +149,7 @@ ComboBox.selectionBackground = @menuSelectionBackground
 ComboBox.popupInsets = 5,0,5,0
 ComboBox.selectionInsets = 0,5,0,5
 ComboBox.selectionArc = 8
+ComboBox.borderCornerRadius = 8
 
 
 #---- Component ----
@@ -205,6 +206,7 @@ PasswordField.selectionForeground = @textSelectionForeground
 #---- PopupMenu ----
 
 PopupMenu.borderInsets = 6,1,6,1
+PopupMenu.borderCornerRadius = 8
 
 
 #---- ProgressBar ----

flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacLightLaf.properties

@@ -150,6 +150,7 @@ ComboBox.selectionBackground = @menuSelectionBackground
 ComboBox.popupInsets = 5,0,5,0
 ComboBox.selectionInsets = 0,5,0,5
 ComboBox.selectionArc = 8
+ComboBox.borderCornerRadius = 8
 
 
 #---- Component ----
@@ -206,6 +207,7 @@ PasswordField.selectionForeground = @textSelectionForeground
 #---- PopupMenu ----
 
 PopupMenu.borderInsets = 6,1,6,1
+PopupMenu.borderCornerRadius = 8
 
 
 #---- ProgressBar ----