From 6f8ec4075be53b17c08cfe4f83f02157cc7bcc12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Thu, 30 Jun 2022 22:08:52 +0200 Subject: [PATCH] Cocoa: Fix GLFW_MAXIMIZED for nonresizable windows The reasoning here is that glfwRestoreWindow will change nothing for a windowed non-resizable window on Cocoa, and silently refusing to maximize seems slightly more like something other platforms would do. This is possibly either the right thing to do or the wrong one. --- README.md | 1 + src/cocoa_window.m | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5b130d5b..73b1613e 100644 --- a/README.md +++ b/README.md @@ -254,6 +254,7 @@ information on what to include when reporting a bug. - [Cocoa] Bugfix: `kUTTypeURL` was deprecated in macOS 12.0 (#2003) - [Cocoa] Bugfix: A connected Apple AirPlay would emit a useless error (#1791) - [Cocoa] Bugfix: The EGL and OSMesa libraries were not unloaded on termination + - [Cocoa] Bugfix: `GLFW_MAXIMIZED` was always true when `GLFW_RESIZABLE` was false - [X11] Bugfix: The CMake files did not check for the XInput headers (#1480) - [X11] Bugfix: Key names were not updated when the keyboard layout changed (#1462,#1528) diff --git a/src/cocoa_window.m b/src/cocoa_window.m index 8821d5bc..0bbc02cf 100644 --- a/src/cocoa_window.m +++ b/src/cocoa_window.m @@ -1353,7 +1353,12 @@ GLFWbool _glfwWindowVisibleCocoa(_GLFWwindow* window) GLFWbool _glfwWindowMaximizedCocoa(_GLFWwindow* window) { @autoreleasepool { - return [window->ns.object isZoomed]; + + if (window->resizable) + return [window->ns.object isZoomed]; + else + return GLFW_FALSE; + } // autoreleasepool }