Use "outer" positions in all window-related operations

iced-rs · Dec 6, 2024 · 169e5fc · 169e5fc
1 parent 3b2a422
commit 169e5fc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/winit/src/program.rs b/winit/src/program.rs
@@ -538,10 +538,25 @@ where
 
                                 log::info!("Window attributes for id `{id:#?}`: {window_attributes:#?}");
 
+                                // On macOS, the `position` in `WindowAttributes` represents the "inner"
+                                // position of the window; while on other platforms it's the "outer" position.
+                                // We fix the inconsistency on macOS by positioning the window after creation.
+                                #[cfg(target_os = "macos")]
+                                let mut window_attributes = window_attributes;
+
+                                #[cfg(target_os = "macos")]
+                                let position =
+                                    window_attributes.position.take();
+
                                 let window = event_loop
                                     .create_window(window_attributes)
                                     .expect("Create window");
 
+                                #[cfg(target_os = "macos")]
+                                if let Some(position) = position {
+                                    window.set_outer_position(position);
+                                }
+
                                 #[cfg(target_arch = "wasm32")]
                                 {
                                     use winit::platform::web::WindowExtWebSys;
@@ -1340,7 +1355,7 @@ fn run_action<P, C>(
                 if let Some(window) = window_manager.get(id) {
                     let position = window
                         .raw
-                        .inner_position()
+                        .outer_position()
                         .map(|position| {
                             let position = position
                                 .to_logical::<f32>(window.raw.scale_factor());

diff --git a/winit/src/program/window_manager.rs b/winit/src/program/window_manager.rs
@@ -164,7 +164,7 @@ where
 {
     pub fn position(&self) -> Option<Point> {
         self.raw
-            .inner_position()
+            .outer_position()
             .ok()
             .map(|position| position.to_logical(self.raw.scale_factor()))
             .map(|position| Point {