Fix 8344372

modules/javafx.graphics/src/main/native-glass/gtk/glass_window.cpp

@@ -1102,6 +1102,8 @@ void WindowContextTop::set_bounds(int x, int y, bool xSet, bool ySet, int w, int
         geometry.final_width.type = BOUNDSTYPE_CONTENT;
         geometry.final_width.value = cw;
         newW = cw;
+    } else {
+        newW = geometry_get_content_width(&geometry);
     }
 
     if (h > 0) {
@@ -1112,8 +1114,11 @@ void WindowContextTop::set_bounds(int x, int y, bool xSet, bool ySet, int w, int
         geometry.final_height.type = BOUNDSTYPE_CONTENT;
         geometry.final_height.value = ch;
         newH = ch;
+    } else {
+        newH = geometry_get_content_height(&geometry);
     }
 
+
     if (newW > 0 || newH > 0) {
         // call update_window_constraints() to let gtk_window_resize succeed, because it's bound to geometry constraints
         update_window_constraints();

tests/system/src/test/java/test/javafx/stage/StageMixedSizeTest.java

@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2024 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package test.robot.javafx.stage;
+
+import javafx.application.Platform;
+import javafx.geometry.Insets;
+import javafx.scene.Scene;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundFill;
+import javafx.scene.layout.CornerRadii;
+import javafx.scene.layout.StackPane;
+import javafx.scene.paint.Color;
+import javafx.stage.Stage;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import test.util.Util;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.function.BiConsumer;
+
+public class StageMixedSizingTest {
+    private static CountDownLatch startupLatch = new CountDownLatch(1);
+    private Stage mainStage;
+
+    @BeforeAll
+    static void initFX() {
+        Platform.setImplicitExit(false);
+        Util.startup(startupLatch, startupLatch::countDown);
+    }
+
+    @AfterAll
+    static void teardown() {
+        Util.shutdown();
+    }
+
+    @AfterEach
+    void afterEach() {
+        Util.runAndWait(() -> {
+            if (mainStage != null) {
+                mainStage.hide();
+            }
+        });
+    }
+
+    @Test
+    public void testSetWidthOnlyAfterShownOnContentSizeWindow() throws Exception {
+        int contentSize = 300;
+        int windowWidth = 200;
+
+        createStage((s, sp) -> {
+            s.setTitle("Width only after content size window");
+            sp.setPrefWidth(contentSize);
+            sp.setPrefHeight(contentSize);
+        }, (s, sp) -> s.setWidth(windowWidth));
+
+        Assertions.assertEquals(windowWidth, mainStage.getWidth(), "Window width should be " + windowWidth);
+    }
+
+    private void createStage(BiConsumer<Stage, StackPane> beforeShown,
+                             BiConsumer<Stage, StackPane> afterShown) throws InterruptedException {
+        CountDownLatch showLatch = new CountDownLatch(1);
+
+        Util.runAndWait(() -> {
+            mainStage = new Stage();
+
+            var sp = new StackPane();
+            sp.setBackground(new Background(new BackgroundFill(Color.YELLOW, CornerRadii.EMPTY, Insets.EMPTY)));
+            if (beforeShown != null) {
+                beforeShown.accept(mainStage, sp);
+            }
+
+            mainStage.setScene(new Scene(sp));
+            mainStage.setOnShown(e -> {
+                if (afterShown != null) {
+                    afterShown.accept(mainStage, sp);
+                }
+
+                showLatch.countDown();
+            });
+
+            mainStage.show();
+        });
+
+        Util.waitForLatch(showLatch, 5, "Stage failed to setup and show");
+        Util.sleep(500);
+    }
+}