Commit 676c3a92634c4da79309e4ba9ebd3234709d8f5f
2017-09-09T10:31:44
Fixed bug 3719 - Cocoa - Incorrect window size when leaving fullscreen bastien.bouclet The window is now resized to its specified size, but it moves to the top left corner of the screen. That is unexpected because neither the user nor the program moved it there. Test program attached (the same one as before).
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m
index a2d14f6..f35220b 100644
--- a/src/video/cocoa/SDL_cocoawindow.m
+++ b/src/video/cocoa/SDL_cocoawindow.m
@@ -520,6 +520,11 @@ SetWindowStyle(SDL_Window * window, NSUInteger style)
NSRect rect = [nswindow contentRectForFrameRect:[nswindow frame]];
ConvertNSRect([nswindow screen], fullscreen, &rect);
+ if (inFullscreenTransition) {
+ /* We'll take care of this at the end of the transition */
+ return;
+ }
+
if (s_moveHack) {
SDL_bool blockMove = ((SDL_GetTicks() - s_moveHack) < 500);
@@ -719,6 +724,7 @@ SetWindowStyle(SDL_Window * window, NSUInteger style)
*/
window->w = 0;
window->h = 0;
+ [self windowDidMove:aNotification];
[self windowDidResize:aNotification];
}
}
@@ -727,13 +733,13 @@ SetWindowStyle(SDL_Window * window, NSUInteger style)
{
SDL_Window *window = _data->window;
+ isFullscreenSpace = NO;
+ inFullscreenTransition = YES;
+
/* As of OS X 10.11, the window seems to need to be resizable when exiting
a Space, in order for it to resize back to its windowed-mode size.
*/
SetWindowStyle(window, GetWindowStyle(window) | NSWindowStyleMaskResizable);
-
- isFullscreenSpace = NO;
- inFullscreenTransition = YES;
}
- (void)windowDidFailToExitFullScreen:(NSNotification *)aNotification
@@ -801,6 +807,7 @@ SetWindowStyle(SDL_Window * window, NSUInteger style)
*/
window->w = 0;
window->h = 0;
+ [self windowDidMove:aNotification];
[self windowDidResize:aNotification];
/* FIXME: Why does the window get hidden? */