From e57da19d4a725241129f8b79adc9ea04cae472be Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@elmindreda.org>
Date: Mon, 29 Dec 2014 19:21:31 +0100
Subject: [PATCH] Fixed OS X enter/leave full screen triggers.
---
src/cocoa_window.m | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/cocoa_window.m b/src/cocoa_window.m
index 986e0256..2f393243 100644
--- a/src/cocoa_window.m
+++ b/src/cocoa_window.m
@@ -195,20 +195,23 @@ static NSRect convertRectToBacking(_GLFWwindow* window, NSRect contentRect)
- (void)windowDidDeminiaturize:(NSNotification *)notification
{
- if (window->monitor)
- enterFullscreenMode(window);
-
_glfwInputWindowIconify(window, GL_FALSE);
}
- (void)windowDidBecomeKey:(NSNotification *)notification
{
+ if (window->monitor)
+ enterFullscreenMode(window);
+
_glfwInputWindowFocus(window, GL_TRUE);
_glfwPlatformApplyCursorMode(window);
}
- (void)windowDidResignKey:(NSNotification *)notification
{
+ if (window->monitor)
+ leaveFullscreenMode(window);
+
_glfwInputWindowFocus(window, GL_FALSE);
}
@@ -1038,9 +1041,6 @@ void _glfwPlatformGetWindowFrameSize(_GLFWwindow* window,
void _glfwPlatformIconifyWindow(_GLFWwindow* window)
{
- if (window->monitor)
- leaveFullscreenMode(window);
-
[window->ns.object miniaturize:nil];
}