8306121: Scene not rendered initially when changing scenes after fix for JDK-8296621

Reviewed-by: jpereda, kcr

Author: Thiago Milczarek Sayao

modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/MouseEventFirerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, 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
@@ -274,7 +274,7 @@ public void setup() {
         setBottomAnchor(bottomRight, 0.);
         setLeftAnchor(bottomRight, 0.);
 
-        content = new AnchorPane(topLeft, center, bottomRight);
+        content = new AnchorPane(center, topLeft, bottomRight);
         scene = new Scene(content);
         stage = new Stage();
         stage.setScene(scene);

modules/javafx.controls/src/test/java/test/javafx/scene/control/ComboBoxTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2023, 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
@@ -1128,7 +1128,13 @@ public void defaultConverterCanHandleIncorrectType_2() {
 
         comboBox.requestFocus();
 
-        new KeyEventFirer(comboBox).doKeyPress(KeyCode.ENTER);
+        var kFirer = new KeyEventFirer(comboBox);
+        // Open selection
+        kFirer.doKeyPress(KeyCode.DOWN, KeyModifier.ALT);
+        // Select first
+        kFirer.doKeyPress(KeyCode.DOWN);
+        // Commit selection
+        kFirer.doKeyPress(KeyCode.ENTER);
     }
 
     @Test public void test_rt31479() {

modules/javafx.graphics/src/main/java/com/sun/glass/ui/gtk/GtkWindow.java

@@ -46,9 +46,8 @@ public GtkWindow(Window owner, Screen screen, int styleMask) {
     @Override
     protected native boolean _setView(long ptr, View view);
 
-    // empty - not needed by this implementation
     @Override
-    protected void _updateViewSize(long ptr) {}
+    protected native void _updateViewSize(long ptr);
 
     @Override
     protected boolean _setMenubar(long ptr, long menubarPtr) {

modules/javafx.graphics/src/main/java/javafx/stage/Stage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2023, 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
@@ -1187,6 +1187,10 @@ private void doVisibleChanged(boolean value) {
             peer.setMaximized(isMaximized());
             peer.setTitle(getTitle());
 
+            if (!isIconified()) {
+                peer.requestFocus();
+            }
+
             List<Object> platformImages = new ArrayList<>();
             for (Image icon : icons) {
                 platformImages.add(Toolkit.getImageAccessor().getPlatformImage(icon));

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

@@ -139,6 +139,20 @@ JNIEXPORT void JNICALL Java_com_sun_glass_ui_gtk_GtkWindow__1showOrHideChildren
     ctx->show_or_hide_children(show);
 }
 
+/*
+ * Class:     com_sun_glass_ui_gtk_GtkWindow
+ * Method:    _updateViewSize
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_sun_glass_ui_gtk_GtkWindow__1updateViewSize
+  (JNIEnv * env, jobject obj, jlong ptr) {
+    (void)env;
+    (void)obj;
+
+    WindowContext* ctx = JLONG_TO_WINDOW_CTX(ptr);
+    ctx->update_view_size();
+}
+
 /*
  * Class:     com_sun_glass_ui_gtk_GtkWindow
  * Method:    minimizeImpl

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2023, 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
@@ -1322,14 +1322,16 @@ void WindowContextTop::set_owner(WindowContext * owner_ctx) {
     owner = owner_ctx;
 }
 
-void WindowContextTop::notify_window_resize() {
-    int w = geometry_get_window_width(&geometry);
-    int h = geometry_get_window_height(&geometry);
+void WindowContextTop::update_view_size() {
+    // Notify the view size only if size is oriented by WINDOW, otherwise it knows its own size
+    if (geometry.final_width.type == BOUNDSTYPE_WINDOW
+        || geometry.final_height.type == BOUNDSTYPE_WINDOW) {
 
-    mainEnv->CallVoidMethod(jwindow, jWindowNotifyResize,
-                 com_sun_glass_events_WindowEvent_RESIZE, w, h);
-    CHECK_JNI_EXCEPTION(mainEnv)
+        notify_view_resize();
+    }
+}
 
+void WindowContextTop::notify_view_resize() {
     if (jview) {
         int cw = geometry_get_content_width(&geometry);
         int ch = geometry_get_content_height(&geometry);
@@ -1339,6 +1341,17 @@ void WindowContextTop::notify_window_resize() {
     }
 }
 
+void WindowContextTop::notify_window_resize() {
+    int w = geometry_get_window_width(&geometry);
+    int h = geometry_get_window_height(&geometry);
+
+    mainEnv->CallVoidMethod(jwindow, jWindowNotifyResize,
+                 com_sun_glass_events_WindowEvent_RESIZE, w, h);
+    CHECK_JNI_EXCEPTION(mainEnv)
+
+    notify_view_resize();
+}
+
 void WindowContextTop::notify_window_move() {
     if (jwindow) {
         mainEnv->CallVoidMethod(jwindow, jWindowNotifyMove,

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2023, 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
@@ -145,6 +145,8 @@ class WindowContext {
 
     virtual void notify_state(jint) = 0;
     virtual void notify_on_top(bool) {}
+    virtual void update_view_size() = 0;
+    virtual void notify_view_resize() = 0;
 
     virtual void add_child(WindowContextTop* child) = 0;
     virtual void remove_child(WindowContextTop* child) = 0;
@@ -302,6 +304,8 @@ class WindowContextTop: public WindowContextBase {
     void set_level(int);
     void set_visible(bool);
     void notify_on_top(bool);
+    void update_view_size();
+    void notify_view_resize();
 
     void enter_fullscreen();
     void exit_fullscreen();

tests/manual/stage/StartIconified.java

@@ -0,0 +1,60 @@
+/*
+ *  Copyright (c) 2023, 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.
+ *
+ */
+
+import javafx.application.Application;
+import javafx.scene.text.Text;
+import javafx.stage.Stage;
+import javafx.scene.Scene;
+import javafx.scene.layout.StackPane;
+
+/***
+ * Stage must initially only show on the OS taskbar, but not on the Screen.
+ * If the stage pops on the Screen and then iconifies, it's wrong.
+ *
+ * Note: Will not work on MacOS until https://bugs.openjdk.org/browse/JDK-8305675 is fixed
+ */
+public class StartIconified extends Application {
+
+    @Override
+    public void start(Stage primaryStage) {
+        primaryStage.setTitle("Iconified Window Test");
+        primaryStage.setWidth(600);
+        primaryStage.setHeight(150);
+        primaryStage.setIconified(true);
+
+        Text text = new Text("""
+                1. The stage must initially appear on the OS taskbar (iconified), but not on the Screen
+                2. Observe if the stage pops and then iconifies (wrong)""");
+
+        Scene scene = new Scene(new StackPane(text));
+        primaryStage.setScene(scene);
+        primaryStage.show();
+    }
+
+    public static void main(String[] args) {
+        launch(StartIconified.class, args);
+    }
+}