maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #6089 from marcelofg55/master

Browse source 
Crashfix for OSX on Sierra beta
This commit is contained in:
Rémi Verschelde 2016-08-09 18:46:48 +02:00 committed by GitHub
parent d4c44485d8 bf320fd4ea
commit ce72bef3a1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
platform/osx/os_osx.mm
View file

@ -1494,8 +1494,6 @@ 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;
@ -1504,8 +1502,10 @@ void OS_OSX::set_window_size(const Size2 p_size) {
CGFloat menuBarHeight = [[[NSApplication sharedApplication] mainMenu] menuBarHeight];
if (menuBarHeight != 0.f) {
size.y+= menuBarHeight;
#if MAC_OS_X_VERSION_MAX_ALLOWED <= 101104
} else {
size.y+= menuHeight;
size.y+= [[NSStatusBar systemStatusBar] thickness];
#endif
}
NSRect frame = [window_object frame];
[window_object setFrame:NSMakeRect(frame.origin.x, frame.origin.y, size.x, size.y) display:YES];