zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-18 01:52:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change GetClientWidth/GetClientHeight on macOS to grab size from view.

Browse source 
Fix that GetClientWidth/Height returns 0 when queried before initial show.
Allow window to be resizable on macOS.
This commit is contained in:
Magnus Norddahl 2016-08-13 17:49:20 +02:00 committed by Christoph Oelckers
parent 647ef5d029
commit 4e38f31a86
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/posix/cocoa/i_video.mm
View file

@ -169,7 +169,7 @@ namespace
const NSInteger LEVEL_WINDOWED = NSNormalWindowLevel; const NSInteger LEVEL_WINDOWED = NSNormalWindowLevel;
const NSUInteger STYLE_MASK_FULLSCREEN = NSBorderlessWindowMask; const NSUInteger STYLE_MASK_FULLSCREEN = NSBorderlessWindowMask;
const NSUInteger STYLE_MASK_WINDOWED = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask; const NSUInteger STYLE_MASK_WINDOWED = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask;
} }
@ -1207,12 +1207,18 @@ void SDLGLFB::ResetGammaTable()
int SDLGLFB::GetClientWidth() int SDLGLFB::GetClientWidth()
{ {
return static_cast<int>(rbOpts.width + 2.0f * rbOpts.shiftX); NSView *view = [[NSOpenGLContext currentContext] view];
NSRect backingBounds = [view convertRectToBacking: [view bounds]];
int clientWidth = (int)backingBounds.size.width;
return clientWidth > 0 ? clientWidth : Width;
} }
int SDLGLFB::GetClientHeight() int SDLGLFB::GetClientHeight()
{ {
return static_cast<int>(rbOpts.height + 2.0f * rbOpts.shiftY); NSView *view = [[NSOpenGLContext currentContext] view];
NSRect backingBounds = [view convertRectToBacking: [view bounds]];
int clientHeight = (int)backingBounds.size.height;
return clientHeight > 0 ? clientHeight : Height;
} }