Skip to content

8377350: [iOS] Add support for UIWindowScene #2072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jperedadnr wants to merge 4 commits into
base: master
Choose a base branch
from
Open

8377350: [iOS] Add support for UIWindowScene #2072

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a109b1
Add support for iOS native window scene
jperedadnr Feb 11, 2026
1f117ed
update copyright
jperedadnr Feb 11, 2026
a392b86
Process feedback
jperedadnr Feb 12, 2026
14f1691
Update comment, and rename variable
jperedadnr Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions modules/javafx.graphics/src/main/native-glass/ios/GlassWindow.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 2026, 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
Expand Down Expand Up @@ -829,16 +829,27 @@ jlong _1createWindow(JNIEnv *env, jobject jWindow, jlong jOwnerPtr, jlong jScree


if (mainWindow == nil) {
//We have to remove rootViewController of splashscreen UIWindow in order to avoid
//StatusBar orientation change ...
UIWindow *splashScreen = [[UIApplication sharedApplication] keyWindow];
splashScreen.rootViewController = nil;

GLASS_LOG("SCREEN: %@", screen);
CGRect applicationFrame = [screen bounds];
GLASS_LOG("FRAME: %@", applicationFrame);

mainWindow = [[GlassMainWindow alloc] initWithFrame:applicationFrame];
GLASS_LOG("FRAME: %.1f %.1f", applicationFrame.size.width, applicationFrame.size.height);
Copy link
Collaborator

@johanvos johanvos Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aren't the dimensions printed when you print the "object" using @ ?

Copy link
Collaborator Author

@jperedadnr jperedadnr Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, CGRect is a struct, and you get this warning:

warning: format specifies type 'id' but the argument has type 'CGRect' (aka 'struct CGRect') [-Wformat]

which can be safely ignored of course, but then the logs won't show a null value:

FRAME: (null)

and that's why I applied the change.


// Remove rootViewController of the initial UIWindow in order to avoid
// StatusBar orientation changes, initialize our mainWindow (GlassMainWindow), and
// set our own rootViewController (GlassViewController).
UIWindow *initialWindow;
UIWindowScene *windowScene = (UIWindowScene *)[[UIApplication sharedApplication] connectedScenes].allObjects.firstObject;
if (windowScene) {
initialWindow = windowScene.windows.firstObject;
if (initialWindow) {
mainWindow = [[GlassMainWindow alloc] initWithWindowScene:windowScene];
}
}
if (!initialWindow) {
// fallback if no windowScene (very unlikely), or no initialWindow (if no SceneDelegate is used, for instance) are found:
initialWindow = [[UIApplication sharedApplication] keyWindow];
mainWindow = [[GlassMainWindow alloc] initWithFrame:applicationFrame];
}
initialWindow.rootViewController = nil;
mainWindowHost = [[GlassMainView alloc] initWithFrame:CGRectMake(0.0, 0.0, applicationFrame.size.width, applicationFrame.size.height)];

// Set GlassViewController - responsible for orientation change, etc.
Expand Down