From bf320fd4eaae1bdaae08063573c88ab51d6edc34 Mon Sep 17 00:00:00 2001 From: marcelofg55 Date: Tue, 9 Aug 2016 13:40:14 -0300 Subject: Crashfix for OSX on Sierra beta --- platform/osx/os_osx.mm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'platform') diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index ffae536ef0..b084a08ecc 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -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]; -- cgit v1.2.3