summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-03-24 12:52:42 +0100
committerGitHub <noreply@github.com>2022-03-24 12:52:42 +0100
commit391633760b0ea292af079287faf79c1aee6d9254 (patch)
treef8f3983b247ac290eae4a824f16d60346d4c0eac
parentac2a19cf240f5e9bbc59725a013df0cd2f7f3215 (diff)
parent6866eee64185c1f71c4d2a6603621dc0a1b368c1 (diff)
Merge pull request #59465 from fountainment/fix_popupmenu
-rw-r--r--platform/osx/display_server_osx.mm6
1 files changed, 5 insertions, 1 deletions
diff --git a/platform/osx/display_server_osx.mm b/platform/osx/display_server_osx.mm
index 9e32cab5ed..8820201c10 100644
--- a/platform/osx/display_server_osx.mm
+++ b/platform/osx/display_server_osx.mm
@@ -1682,7 +1682,11 @@ Point2i DisplayServerOSX::mouse_get_position() const {
for (NSScreen *screen in [NSScreen screens]) {
NSRect frame = [screen frame];
if (NSMouseInRect(mouse_pos, frame, NO)) {
- return Vector2i((int)mouse_pos.x, (int)-mouse_pos.y) * scale + _get_screens_origin();
+ Vector2i pos = Vector2i((int)mouse_pos.x, (int)mouse_pos.y);
+ pos *= scale;
+ pos -= _get_screens_origin();
+ pos.y *= -1;
+ return pos;
}
}
return Vector2i();