macOS: fixed missing close/iconify/maximize buttons on inactive window, if system appearance is dark, but application appearance is light (issue #1032)

Author: DevCharly

CHANGELOG.md

@@ -1,6 +1,12 @@
 FlatLaf Change Log
 ==================
 
+## 3.7.2-SNAPSHOT
+
+- macOS: Fixed missing close/iconify/maximize buttons on inactive window, if
+  system appearance is dark, but application appearance is light. (issue #1032)
+
+
 ## 3.7.1
 
 - System File Chooser:

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

@@ -45,7 +45,7 @@
  */
 public class FlatNativeMacLibrary
 {
-	private static int API_VERSION_MACOS = 2003;
+	private static int API_VERSION_MACOS = 2004;
 
 	/**
 	 * Checks whether native library is loaded/available.
@@ -57,6 +57,7 @@ public static boolean isLoaded() {
 		return SystemInfo.isMacOS && FlatNativeLibrary.isLoaded( API_VERSION_MACOS );
 	}
 
+	/** @since 3.7.2 */ public native static boolean setWindowAppearance( Window window, String appearance );
 	public native static boolean setWindowRoundedBorder( Window window, float radius, float borderWidth, int borderColor );
 
 	/** @since 3.4 */

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

@@ -178,6 +178,7 @@ protected void installDefaults( JRootPane c ) {
 			}
 		}
 
+		macSetWindowAppearance( c );
 		macClearBackgroundForTranslucentWindow( c );
 	}
 
@@ -369,6 +370,17 @@ private boolean isMacButtonsSpacingSupported() {
 		return SystemInfo.isMacOS && SystemInfo.isJava_17_orLater && FlatNativeMacLibrary.isLoaded();
 	}
 
+	private void macSetWindowAppearance( JRootPane c ) {
+		if( !SystemInfo.isMacOS )
+			return;
+
+		Window window = getParentWindow( c );
+		if( window != null && FlatNativeMacLibrary.isLoaded() ) {
+			FlatNativeMacLibrary.setWindowAppearance( window, FlatLaf.isLafDark()
+				? "NSAppearanceNameDarkAqua" : "NSAppearanceNameAqua" );
+		}
+	}
+
 	private void macInstallWindowBackgroundListener( JRootPane c ) {
 		if( !SystemInfo.isMacOS )
 			return;
@@ -511,6 +523,7 @@ public void propertyChange( PropertyChangeEvent e ) {
 					if( titlePane != null && !Objects.equals( titlePane.windowStyle, FlatTitlePane.getWindowStyle( rootPane ) ) )
 						setTitlePane( createTitlePane() );
 
+					macSetWindowAppearance( rootPane );
 					macClearBackgroundForTranslucentWindow( rootPane );
 				}
 

flatlaf-natives/flatlaf-natives-macos/src/main/headers/com_formdev_flatlaf_ui_FlatNativeMacLibrary.h

@@ -24,7 +24,7 @@
 
 // increase this version if changing API or functionality of native library
 // also update version in Java class com.formdev.flatlaf.ui.FlatNativeMacLibrary
-#define API_VERSION_MACOS		2003
+#define API_VERSION_MACOS		2004
 
 
 //---- JNI methods ------------------------------------------------------------

flatlaf-natives/flatlaf-natives-macos/src/main/objcpp/ApiVersion.mm

@@ -91,6 +91,37 @@ @implementation WindowData
 	return windowData;
 }
 
+extern "C"
+JNIEXPORT jboolean JNICALL Java_com_formdev_flatlaf_ui_FlatNativeMacLibrary_setWindowAppearance
+	( JNIEnv* env, jclass cls, jobject window, jstring appearance )
+{
+	JNI_COCOA_ENTER()
+
+	NSWindow* nsWindow = getNSWindow( env, cls, window );
+	if( nsWindow == NULL )
+		return FALSE;
+
+	// convert Java strings to NSString (on Java thread)
+	NSString* nsAppearance = JavaToNSString( env, appearance );
+
+	[FlatJNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+		JNI_COCOA_TRY()
+
+		NSAppearance *appearance = [NSAppearance appearanceNamed:nsAppearance];
+		if( appearance != NULL )
+			nsWindow.appearance = appearance;
+		else
+			NSLog( @"FlatLaf: unknown window appearance '%@'", nsAppearance );
+
+		JNI_COCOA_CATCH()
+	}];
+
+	return TRUE;
+
+	JNI_COCOA_EXIT()
+	return FALSE;
+}
+
 extern "C"
 JNIEXPORT jboolean JNICALL Java_com_formdev_flatlaf_ui_FlatNativeMacLibrary_setWindowRoundedBorder
 	( JNIEnv* env, jclass cls, jobject window, jfloat radius, jfloat borderWidth, jint borderColor )