Skip to content
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.

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

Bugfix for vulkan fullscreen support on OSX #8216

Merged
merged 1 commit into from Nov 6, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 13 additions & 0 deletions engine/glfw/lib/cocoa/cocoa_window.m
Expand Up @@ -174,6 +174,11 @@ - (void)activateProcess

- (void)activateWindow
{
if(_glfwWin.clientAPI != GLFW_OPENGL_API && _glfwWin.fullscreen )
{
[_glfwWin.window toggleFullScreen:nil];
}

[_glfwWin.window makeKeyAndOrderFront:nil];
// Starting from macOS Sonoma (14.0) an extra step needed
NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
Expand Down Expand Up @@ -758,6 +763,14 @@ int _glfwPlatformOpenWindow( int width, int height,
else
{
styleMask = NSBorderlessWindowMask;

if (_glfwWin.clientAPI != GLFW_OPENGL_API)
{
styleMask |= NSWindowStyleMaskTitled |
NSWindowStyleMaskClosable |
NSWindowStyleMaskMiniaturizable |
NSWindowStyleMaskResizable;
}
}

_glfwWin.window = [[NSWindow alloc]
Expand Down