asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #6021 from marcelofg55/master

Browse source 
Fix set_window_size not setting the correct size on OSX
This commit is contained in:
Rémi Verschelde 2016-08-03 07:33:44 +02:00 • committed by GitHub
commit 01ac237ab7
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
platform/osx/os_osx.mm
View file

@ -1494,9 +1494,19 @@ Size2 OS_OSX::get_window_size() const {
};
const int menuHeight = [[NSStatusBar systemStatusBar] thickness];
void OS_OSX::set_window_size(const Size2 p_size) {
Size2 size=p_size;
// NSRect used by setFrame includes the title bar, so add it to our size.y
CGFloat menuBarHeight = [[[NSApplication sharedApplication] mainMenu] menuBarHeight];
if (menuBarHeight != 0.f) {
size.y+= menuBarHeight;
} else {
size.y+= menuHeight;
}
NSRect frame = [window_object frame];
[window_object setFrame:NSMakeRect(frame.origin.x, frame.origin.y, size.x, size.y) display:YES];
};