migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-09-01 06:10:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

macOS: Fix surface position (#4027)

Browse Source
This commit is contained in:
Mads Marquart
2024-12-03 17:31:32 +01:00
committed by GitHub
parent 132fbe14d5
commit ca46e29203
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/platform_impl/apple/appkit/window_delegate.rs
View File

@@ -945,8 +945,21 @@ impl WindowDelegate {
} }
pub fn surface_position(&self) -> PhysicalPosition<i32> { pub fn surface_position(&self) -> PhysicalPosition<i32> {
let content_rect = self.window().contentRectForFrameRect(self.window().frame()); // The calculation here is a bit awkward because we've gotta reconcile the
let logical = LogicalPosition::new(content_rect.origin.x, content_rect.origin.y); // different origins (Winit prefers top-left vs. NSWindow's bottom-left),
// and I couldn't find a built-in way to do so.
// The position of the window and the view, both in Winit screen coordinates.
let window_position = flip_window_screen_coordinates(self.window().frame());
let view_position = flip_window_screen_coordinates(
self.window().contentRectForFrameRect(self.window().frame()),
);
// And use that to convert the view position to window coordinates.
let surface_position =
NSPoint::new(view_position.x - window_position.x, view_position.y - window_position.y);
let logical = LogicalPosition::new(surface_position.x, surface_position.y);
logical.to_physical(self.scale_factor()) logical.to_physical(self.scale_factor())
} }