|
@@ -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) {
|
|
void OS_OSX::set_window_size(const Size2 p_size) {
|
|
|
|
|
|
Size2 size=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];
|
|
NSRect frame = [window_object frame];
|
|
[window_object setFrame:NSMakeRect(frame.origin.x, frame.origin.y, size.x, size.y) display:YES];
|
|
[window_object setFrame:NSMakeRect(frame.origin.x, frame.origin.y, size.x, size.y) display:YES];
|
|
};
|
|
};
|