geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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).
Sam Lantinga 2017-09-09 10:31:44 -07:00
parent fcd9c19022
commit 676c3a9263
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/video/cocoa/SDL_cocoawindow.m
View File

@ -520,6 +520,11 @@ SetWindowStyle(SDL_Window * window, NSUInteger style)
NSRect rect = [nswindow contentRectForFrameRect:[nswindow frame]]; NSRect rect = [nswindow contentRectForFrameRect:[nswindow frame]];
ConvertNSRect([nswindow screen], fullscreen, &rect); ConvertNSRect([nswindow screen], fullscreen, &rect);
if (inFullscreenTransition) {
/* We'll take care of this at the end of the transition */
return;
}
if (s_moveHack) { if (s_moveHack) {
SDL_bool blockMove = ((SDL_GetTicks() - s_moveHack) < 500); SDL_bool blockMove = ((SDL_GetTicks() - s_moveHack) < 500);
@ -719,6 +724,7 @@ SetWindowStyle(SDL_Window * window, NSUInteger style)
*/ */
window->w = 0; window->w = 0;
window->h = 0; window->h = 0;
[self windowDidMove:aNotification];
[self windowDidResize:aNotification]; [self windowDidResize:aNotification];
} }
} }
@ -727,13 +733,13 @@ SetWindowStyle(SDL_Window * window, NSUInteger style)
{ {
SDL_Window *window = _data->window; 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 /* 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. a Space, in order for it to resize back to its windowed-mode size.
*/ */
SetWindowStyle(window, GetWindowStyle(window) | NSWindowStyleMaskResizable); SetWindowStyle(window, GetWindowStyle(window) | NSWindowStyleMaskResizable);
isFullscreenSpace = NO;
inFullscreenTransition = YES;
} }
- (void)windowDidFailToExitFullScreen:(NSNotification *)aNotification - (void)windowDidFailToExitFullScreen:(NSNotification *)aNotification
@ -801,6 +807,7 @@ SetWindowStyle(SDL_Window * window, NSUInteger style)
*/ */
window->w = 0; window->w = 0;
window->h = 0; window->h = 0;
[self windowDidMove:aNotification];
[self windowDidResize:aNotification]; [self windowDidResize:aNotification];
/* FIXME: Why does the window get hidden? */ /* FIXME: Why does the window get hidden? */