Merge pull request #6021 from marcelofg55/master

Fix set_window_size not setting the correct size on OSX

1 files changed, 10 insertions, 0 deletions

diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index dc87f767f6..ffae536ef0 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -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];
 };