summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-08-21 20:18:58 +0200
committerGitHub <noreply@github.com>2017-08-21 20:18:58 +0200
commit01d4ffd3ee8abbbfba45871ee8d83eee18d3bf97 (patch)
tree1cdcc541483b31d004afc8e57f4fdcd5cabc5862
parent1be30f35a68a9fb2c156ded45c8689cc44f26f29 (diff)
parentc6edf1821e6fcbb41fd6c2a21a1017130b07e56d (diff)
Merge pull request #10505 from marcelofg55/osx_window_position
Fix y axis for set_window_position on OS X
-rw-r--r--platform/osx/os_osx.mm11
1 files changed, 8 insertions, 3 deletions
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index 6d8a6eca66..33b1e64dd4 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -1514,9 +1514,14 @@ Point2 OS_OSX::get_window_position() const {
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();
};