Revert core changes. Fix Mac glass code so it reports maximized state…

… correctly.
beldenfox · Oct 21, 2023 · 94fe8dc · 94fe8dc
1 parent cc72d4a
commit 94fe8dc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/modules/javafx.graphics/src/main/java/javafx/stage/Stage.java b/modules/javafx.graphics/src/main/java/javafx/stage/Stage.java
@@ -1138,19 +1138,9 @@ public String getName() {
      * This can be replaced by listening for the onShowing/onHiding events
      * Note: This method MUST only be called via its accessor method.
      */
-    private boolean postVisibleFullScreen;
-    private boolean postVisibleIconified;
-    private boolean postVisibleMaximized;
-
     private void doVisibleChanging(boolean value) {
         Toolkit toolkit = Toolkit.getToolkit();
         if (value && (getPeer() == null)) {
-            // In case the platform window alters these
-            // properties while we're finishing installation.
-            postVisibleFullScreen = isFullScreen();
-            postVisibleIconified = isIconified();
-            postVisibleMaximized = isMaximized();
-
             // Setup the peer
             Window window = getOwner();
             TKStage tkStage = (window == null ? null : window.getPeer());
@@ -1191,10 +1181,10 @@ private void doVisibleChanged(boolean value) {
             TKStage peer = getPeer();
             peer.setImportant(isImportant());
             peer.setResizable(isResizable());
-            peer.setFullScreen(postVisibleFullScreen);
+            peer.setFullScreen(isFullScreen());
             peer.setAlwaysOnTop(isAlwaysOnTop());
-            peer.setIconified(postVisibleIconified);
-            peer.setMaximized(postVisibleMaximized);
+            peer.setIconified(isIconified());
+            peer.setMaximized(isMaximized());
             peer.setTitle(getTitle());
 
             if (!isIconified()) {

diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassWindow.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassWindow.m
@@ -208,6 +208,22 @@ - (void)sendEvent:(NSEvent *)event
 
 @implementation GlassWindow_Normal
 GLASS_NS_WINDOW_IMPLEMENTATION
+
+-(NSRect)windowWillUseStandardFrame:(NSWindow*)window defaultFrame:(NSRect)newFrame
+{
+    // For windows without titlebars the OS will suggest a frame that's the
+    // same size as the existing window, not the screen.
+    if (window.screen != nil && (window.styleMask & NSWindowStyleMaskTitled) == 0) {
+        return window.screen.visibleFrame;
+    }
+    return newFrame;
+}
+
+-(BOOL)isZoomed
+{
+    // Ensure the window is not reported as maximized during initialization
+    return self.screen != nil && [super isZoomed];
+}
 @end
 
 @implementation GlassWindow_Panel

diff --git a/tests/system/src/test/java/test/javafx/stage/MaximizeUndecorated.java b/tests/system/src/test/java/test/javafx/stage/MaximizeUndecorated.java
@@ -77,8 +77,6 @@ public static void teardown() {
 
     @Test
     public void testMaximize() throws Exception {
-        // temporary until JDK-8255835 is fixed
-        assumeTrue(!PlatformUtil.isMac());
         Util.sleep(200);
 
         boolean movedToTopCorner = stage.getY() != POS && stage.getX() != POS;