瀏覽代碼

Merge pull request #10510 from marcelofg55/osx_window_position_2.1

Fix y axis for set_window_position on OS X
Rémi Verschelde 8 年之前
父節點
當前提交
371473db89
共有 1 個文件被更改,包括 8 次插入3 次删除
  1. 8 3
      platform/osx/os_osx.mm

+ 8 - 3
platform/osx/os_osx.mm

@@ -1465,9 +1465,14 @@ void OS_OSX::_update_window() {
 
 void OS_OSX::set_window_position(const Point2 &p_position) {
 
-	Point2 size = p_position;
-	size /= display_scale;
-	[window_object setFrame:NSMakeRect(size.x, size.y, [window_object frame].size.width, [window_object frame].size.height) display:YES];
+	Size2 scr = get_screen_size();
+	NSPoint pos;
+
+	pos.x = p_position.x / display_scale;
+	// For OS X the y starts at the bottom
+	pos.y = (scr.height - p_position.y) / display_scale;
+
+	[window_object setFrameTopLeftPoint:pos];
 
 	_update_window();
 };