8362091: Window title bar should reflect scene color scheme

Michael Strauß · Michael Strauß · commit d88354644e55 · 2025-10-01T18:22:42.000Z
Reviewed-by: kcr, angorya
diff --git a/buildSrc/win.gradle b/buildSrc/win.gradle
@@ -326,9 +326,9 @@ WIN.glass.rcFlags = [
 WIN.glass.ccFlags = [ccFlags].flatten()
 WIN.glass.linker = linker
 WIN.glass.linkFlags = (IS_STATIC_BUILD ? [linkFlags] : [linkFlags, "delayimp.lib", "gdi32.lib", "urlmon.lib", "Comdlg32.lib",
-        "winmm.lib", "imm32.lib", "shell32.lib", "Uiautomationcore.lib", "dwmapi.lib",
+        "winmm.lib", "imm32.lib", "shell32.lib", "Uiautomationcore.lib", "dwmapi.lib", "version.lib",
         "/DELAYLOAD:user32.dll", "/DELAYLOAD:urlmon.dll", "/DELAYLOAD:winmm.dll", "/DELAYLOAD:shell32.dll",
-        "/DELAYLOAD:Uiautomationcore.dll", "/DELAYLOAD:dwmapi.dll"]).flatten()
+        "/DELAYLOAD:Uiautomationcore.dll", "/DELAYLOAD:dwmapi.dll", "/DELAYLOAD:version.dll"]).flatten()
 WIN.glass.lib = "glass"
 
 WIN.decora = [:]
diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Window.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Window.java
@@ -173,6 +173,11 @@ static protected void remove(Window window) {
      */
     @Native public static final int MODAL = 1 << 10;
 
+    /**
+     * Indicates that the window should use a dark window frame.
+     */
+    @Native public static final int DARK_FRAME = 1 << 11;
+
     final static public class State {
         @Native public static final int NORMAL = 1;
         @Native public static final int MINIMIZED = 2;
@@ -988,6 +993,8 @@ public boolean setBackground(final float r, final float g, final float b) {
         return _setBackground(this.ptr, r, g, b);
     }
 
+    public void setDarkFrame(boolean value) {}
+
     public boolean isEnabled() {
         Application.checkEventThread();
         return this.disableCount == 0;
diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacWindow.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacWindow.java
@@ -113,6 +113,13 @@ protected MacWindow(Window owner, Screen screen, int styleMask) {
 
     private native void _setIcon(long ptr, Object iconBuffer, int width, int height);
 
+    @Override
+    public void setDarkFrame(boolean value) {
+        _setDarkFrame(getRawHandle(), value);
+    }
+
+    private native void _setDarkFrame(long ptr, boolean value);
+
     @Override native protected void _toFront(long ptr);
     @Override native protected void _toBack(long ptr);
 
diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/win/WinWindow.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/win/WinWindow.java
@@ -265,6 +265,13 @@ protected boolean _setBackground(long ptr, float r, float g, float b) {
         return true;
     }
 
+    private native void _setDarkFrame(long ptr, boolean value);
+
+    @Override
+    public void setDarkFrame(boolean value) {
+        _setDarkFrame(getRawHandle(), value);
+    }
+
     native private long _getInsets(long ptr);
     native private long _getAnchor(long ptr);
     native private void _showSystemMenu(long ptr, int x, int y);
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/DummyToolkit.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/DummyToolkit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -101,7 +101,8 @@ public void exitAllNestedEventLoops() {
     }
 
     @Override
-    public TKStage createTKStage(Window peerWindow, StageStyle stageStyle, boolean primary, Modality modality, TKStage owner, boolean rtl) {
+    public TKStage createTKStage(Window peerWindow, StageStyle stageStyle, boolean primary,
+                                 Modality modality, TKStage owner, boolean rtl, boolean darkFrame) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/TKStage.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/TKStage.java
@@ -124,6 +124,8 @@ public void setBounds(float x, float y, boolean xSet, boolean ySet,
 
     public void setPrefHeaderButtonHeight(double height);
 
+    public void setDarkFrame(boolean value);
+
     // =================================================================================================================
     // Functions
 
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/Toolkit.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/Toolkit.java
@@ -360,7 +360,8 @@ protected Toolkit() {
 
     public abstract boolean isNestedLoopRunning();
 
-    public abstract TKStage createTKStage(Window peerWindow, StageStyle stageStyle, boolean primary, Modality modality, TKStage owner, boolean rtl);
+    public abstract TKStage createTKStage(Window peerWindow, StageStyle stageStyle, boolean primary,
+                                          Modality modality, TKStage owner, boolean rtl, boolean darkFrame);
 
     public abstract TKStage createTKPopupStage(Window peerWindow, StageStyle popupStyle, TKStage owner);
     public abstract TKStage createTKEmbeddedStage(HostInterface host);
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassStage.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassStage.java
@@ -77,6 +77,9 @@ protected GlassStage() {
     @Override
     public void setPrefHeaderButtonHeight(double height) {}
 
+    @Override
+    public void setDarkFrame(boolean value) {}
+
     protected final GlassScene getScene() {
         return scene;
     }
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java
@@ -608,9 +608,10 @@ void vsyncHint() {
         }
     }
 
-    @Override public TKStage createTKStage(Window peerWindow, StageStyle stageStyle, boolean primary, Modality modality, TKStage owner, boolean rtl) {
+    @Override public TKStage createTKStage(Window peerWindow, StageStyle stageStyle, boolean primary,
+                                           Modality modality, TKStage owner, boolean rtl, boolean darkFrame) {
         assertToolkitRunning();
-        WindowStage stage = new WindowStage(peerWindow, stageStyle, modality, owner);
+        WindowStage stage = new WindowStage(peerWindow, stageStyle, modality, owner, darkFrame);
         if (primary) {
             stage.setIsPrimary();
         }
@@ -693,7 +694,7 @@ private boolean maxNestedEventLoopsHit() {
 
     @Override public TKStage createTKPopupStage(Window peerWindow, StageStyle popupStyle, TKStage owner) {
         assertToolkitRunning();
-        WindowStage stage = new WindowStage(peerWindow, popupStyle, null, owner);
+        WindowStage stage = new WindowStage(peerWindow, popupStyle, null, owner, false);
         stage.setIsPopup();
         stage.init(systemMenu);
         return stage;
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java
@@ -66,6 +66,7 @@ public class WindowStage extends GlassStage {
     private OverlayWarning warning = null;
     private boolean rtl = false;
     private boolean transparent = false;
+    private boolean darkFrame = false;
     private boolean isPrimaryStage = false;
     private boolean isPopupStage = false;
     private boolean isInFullScreen = false;
@@ -85,11 +86,12 @@ public class WindowStage extends GlassStage {
         ResourceBundle.getBundle(WindowStage.class.getPackage().getName() +
                                  ".QuantumMessagesBundle", LOCALE);
 
-
-    public WindowStage(javafx.stage.Window peerWindow, final StageStyle stageStyle, Modality modality, TKStage owner) {
+    public WindowStage(javafx.stage.Window peerWindow, final StageStyle stageStyle, Modality modality,
+                       TKStage owner, boolean darkFrame) {
         this.style = stageStyle;
         this.owner = (GlassStage)owner;
         this.modality = modality;
+        this.darkFrame = darkFrame;
 
         if (peerWindow instanceof javafx.stage.Stage) {
             fxStage = (Stage)peerWindow;
@@ -177,6 +179,10 @@ private void initPlatformWindow() {
                 windowMask |= Window.MODAL;
             }
 
+            if (darkFrame) {
+                windowMask |= Window.DARK_FRAME;
+            }
+
             platformWindow = app.createWindow(ownerWindow, Screen.getMainScreen(), windowMask);
             platformWindow.setResizable(resizable);
             platformWindow.setFocusable(focusable);
@@ -904,4 +910,13 @@ public void setPrefHeaderButtonHeight(double height) {
             platformWindow.setPrefHeaderButtonHeight(height);
         }
     }
+
+    @Override
+    public void setDarkFrame(boolean value) {
+        darkFrame = value;
+
+        if (platformWindow != null) {
+            platformWindow.setDarkFrame(value);
+        }
+    }
 }
diff --git a/modules/javafx.graphics/src/main/java/javafx/stage/Stage.java b/modules/javafx.graphics/src/main/java/javafx/stage/Stage.java
@@ -28,6 +28,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javafx.application.ColorScheme;
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -42,6 +43,7 @@
 import javafx.scene.layout.HeaderBar;
 
 import com.sun.javafx.PreviewFeature;
+import com.sun.javafx.application.PlatformImpl;
 import com.sun.javafx.collections.VetoableListDecorator;
 import com.sun.javafx.collections.TrackableObservableList;
 import com.sun.javafx.scene.SceneHelper;
@@ -1111,10 +1113,13 @@ private void doVisibleChanging(boolean value) {
             TKStage tkStage = (window == null ? null : window.getPeer());
             Scene scene = getScene();
             boolean rtl = scene != null && scene.getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT;
+            ColorScheme colorScheme = scene != null
+                ? scene.getPreferences().getColorScheme()
+                : PlatformImpl.getPlatformPreferences().getColorScheme();
 
             StageStyle stageStyle = getStyle();
             setPeer(toolkit.createTKStage(this, stageStyle, isPrimary(),
-                    getModality(), tkStage, rtl));
+                    getModality(), tkStage, rtl, colorScheme == ColorScheme.DARK));
             getPeer().setMinimumSize((int) Math.ceil(getMinWidth()),
                     (int) Math.ceil(getMinHeight()));
             getPeer().setMaximumSize((int) Math.floor(getMaxWidth()),
diff --git a/modules/javafx.graphics/src/main/java/javafx/stage/Window.java b/modules/javafx.graphics/src/main/java/javafx/stage/Window.java
@@ -27,7 +27,9 @@
 
 import java.util.HashMap;
 
+import javafx.application.ColorScheme;
 import javafx.application.Platform;
+import javafx.beans.Observable;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.DoublePropertyBase;
 import javafx.beans.property.ObjectProperty;
@@ -40,6 +42,7 @@
 import javafx.beans.property.ReadOnlyDoubleWrapper;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleDoubleProperty;
+import javafx.beans.value.ChangeListener;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableMap;
@@ -821,6 +824,7 @@ public Object getUserData() {
     public final ReadOnlyObjectProperty<Scene> sceneProperty() { return scene.getReadOnlyProperty(); }
 
     private final class SceneModel extends ReadOnlyObjectWrapper<Scene> {
+        private final ChangeListener<ColorScheme> colorSchemeListener = this::updateDarkFrame;
         private Scene oldScene;
 
         @Override protected void invalidated() {
@@ -835,6 +839,7 @@ private final class SceneModel extends ReadOnlyObjectWrapper<Scene> {
             updatePeerScene(null);
             // Second, dispose scene peer
             if (oldScene != null) {
+                oldScene.getPreferences().colorSchemeProperty().removeListener(colorSchemeListener);
                 SceneHelper.setWindow(oldScene, null);
                 StyleManager.getInstance().forget(oldScene);
             }
@@ -864,6 +869,8 @@ private final class SceneModel extends ReadOnlyObjectWrapper<Scene> {
                         adjustSize(true);
                     }
                 }
+
+                newScene.getPreferences().colorSchemeProperty().addListener(colorSchemeListener);
             }
 
             oldScene = newScene;
@@ -885,6 +892,13 @@ private void updatePeerScene(final TKScene tkScene) {
                 peer.setScene(tkScene);
             }
         }
+
+        private void updateDarkFrame(Observable observable, ColorScheme oldValue, ColorScheme newValue) {
+            if (peer != null) {
+                Toolkit.getToolkit().checkFxUserThread();
+                peer.setDarkFrame(newValue == ColorScheme.DARK);
+            }
+        }
     }
 
     /**
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassWindow.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassWindow.m
@@ -381,6 +381,7 @@ static jlong _createWindowCommonDo(JNIEnv *env, jobject jWindow, jlong jOwnerPtr
         bool isPopup = (jStyleMask & com_sun_glass_ui_Window_POPUP) != 0;
         bool isUnified = (jStyleMask & com_sun_glass_ui_Window_UNIFIED) != 0;
         bool isExtended = (jStyleMask & com_sun_glass_ui_Window_EXTENDED) != 0;
+        bool isDarkFrame = (jStyleMask & com_sun_glass_ui_Window_DARK_FRAME) != 0;
 
         NSUInteger styleMask = NSWindowStyleMaskBorderless;
         // only titled windows get title
@@ -506,6 +507,9 @@ static jlong _createWindowCommonDo(JNIEnv *env, jobject jWindow, jlong jOwnerPtr
         window->isLocationAssigned = NO;
         window->isResizable = NO;
         [window _setResizable:NO]; // actual value will be set later with a separate JNI downcall
+        [window->nsWindow setAppearance:isDarkFrame
+            ? [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua]
+            : [NSAppearance appearanceNamed:NSAppearanceNameAqua]];
     }
     [pool drain];
 
@@ -1379,6 +1383,29 @@ static jlong _createWindowCommonDo(JNIEnv *env, jobject jWindow, jlong jOwnerPtr
     GLASS_CHECK_EXCEPTION(env);
 }
 
+/*
+ * Class:     com_sun_glass_ui_mac_MacWindow
+ * Method:    _setDarkFrame
+ * Signature: (JZ)V
+ */
+JNIEXPORT void JNICALL Java_com_sun_glass_ui_mac_MacWindow__1setDarkFrame
+(JNIEnv *env, jobject jWindow, jlong jPtr, jboolean dark)
+{
+    LOG("Java_com_sun_glass_ui_mac_MacWindow__1setDarkFrame");
+    if (!jPtr) return;
+
+    GLASS_ASSERT_MAIN_JAVA_THREAD(env);
+    GLASS_POOL_ENTER;
+    {
+        GlassWindow *window = getGlassWindow(env, jPtr);
+        [window->nsWindow setAppearance:dark
+            ? [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua]
+            : [NSAppearance appearanceNamed:NSAppearanceNameAqua]];
+    }
+    GLASS_POOL_EXIT;
+    GLASS_CHECK_EXCEPTION(env);
+}
+
 /*
  * Class:     com_sun_glass_ui_mac_MacWindow
  * Method:    _toFront
diff --git a/modules/javafx.graphics/src/main/native-glass/win/GlassWindow.cpp b/modules/javafx.graphics/src/main/native-glass/win/GlassWindow.cpp
diff --git a/modules/javafx.graphics/src/main/native-glass/win/GlassWindow.h b/modules/javafx.graphics/src/main/native-glass/win/GlassWindow.h
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubStage.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubStage.java
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubToolkit.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubToolkit.java

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -101,7 +101,8 @@ public void exitAllNestedEventLoops() {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`@Override`
`104`		`- public TKStage createTKStage(Window peerWindow, StageStyle stageStyle, boolean primary, Modality modality, TKStage owner, boolean rtl) {`
	`104`	`+ public TKStage createTKStage(Window peerWindow, StageStyle stageStyle, boolean primary,`
	`105`	`+ Modality modality, TKStage owner, boolean rtl, boolean darkFrame) {`
`105`	`106`	`throw new UnsupportedOperationException("Not supported yet.");`
`106`	`107`	`}`
`107`	`108`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,9 @@ protected GlassStage() {`
`77`	`77`	`@Override`
`78`	`78`	`public void setPrefHeaderButtonHeight(double height) {}`
`79`	`79`
	`80`	`+ @Override`
	`81`	`+ public void setDarkFrame(boolean value) {}`
	`82`	`+`
`80`	`83`	`protected final GlassScene getScene() {`
`81`	`84`	`return scene;`
`82`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -608,9 +608,10 @@ void vsyncHint() {`
`608`	`608`	`}`
`609`	`609`	`}`
`610`	`610`
`611`		`- @Override public TKStage createTKStage(Window peerWindow, StageStyle stageStyle, boolean primary, Modality modality, TKStage owner, boolean rtl) {`
	`611`	`+ @Override public TKStage createTKStage(Window peerWindow, StageStyle stageStyle, boolean primary,`
	`612`	`+ Modality modality, TKStage owner, boolean rtl, boolean darkFrame) {`
`612`	`613`	`assertToolkitRunning();`
`613`		`- WindowStage stage = new WindowStage(peerWindow, stageStyle, modality, owner);`
	`614`	`+ WindowStage stage = new WindowStage(peerWindow, stageStyle, modality, owner, darkFrame);`
`614`	`615`	`if (primary) {`
`615`	`616`	`stage.setIsPrimary();`
`616`	`617`	`}`
`@@ -693,7 +694,7 @@ private boolean maxNestedEventLoopsHit() {`
`693`	`694`
`694`	`695`	`@Override public TKStage createTKPopupStage(Window peerWindow, StageStyle popupStyle, TKStage owner) {`
`695`	`696`	`assertToolkitRunning();`
`696`		`- WindowStage stage = new WindowStage(peerWindow, popupStyle, null, owner);`
	`697`	`+ WindowStage stage = new WindowStage(peerWindow, popupStyle, null, owner, false);`
`697`	`698`	`stage.setIsPopup();`
`698`	`699`	`stage.init(systemMenu);`
`699`	`700`	`return stage;`