Merge pull request godotengine#59465 from fountainment/fix_popupmenu

akien-mga · web-flow · commit 391633760b0e · 2022-03-24T12:52:42.000+01:00
diff --git a/platform/osx/display_server_osx.mm b/platform/osx/display_server_osx.mm
@@ -1682,7 +1682,11 @@
 	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();

Original file line number	Diff line number	Diff line change
`@@ -1682,7 +1682,11 @@`
`1682`	`1682`	`for (NSScreen *screen in [NSScreen screens]) {`
`1683`	`1683`	`NSRect frame = [screen frame];`
`1684`	`1684`	`if (NSMouseInRect(mouse_pos, frame, NO)) {`
`1685`		`- return Vector2i((int)mouse_pos.x, (int)-mouse_pos.y) * scale + _get_screens_origin();`
	`1685`	`+ Vector2i pos = Vector2i((int)mouse_pos.x, (int)mouse_pos.y);`
	`1686`	`+ pos *= scale;`
	`1687`	`+ pos -= _get_screens_origin();`
	`1688`	`+ pos.y *= -1;`
	`1689`	`+ return pos;`
`1686`	`1690`	`}`
`1687`	`1691`	`}`
`1688`	`1692`	`return Vector2i();`