Rename `fetch_location` to `fetch_position`

4 files changed, 43 insertions, 41 deletions

diff --git a/runtime/src/window.rs b/runtime/src/window.rs
index c5acfddc..24171e3e 100644
--- a/runtime/src/window.rs
+++ b/runtime/src/window.rs
@@ -101,22 +101,22 @@ pub fn minimize<Message>(id: Id, minimized: bool) -> Command<Message> {
     Command::single(command::Action::Window(Action::Minimize(id, minimized)))
 }
 
-/// Moves the window to the given logical coordinates.
-pub fn move_to<Message>(id: Id, position: Point) -> Command<Message> {
-    Command::single(command::Action::Window(Action::Move(id, position)))
-}
-
-/// Fetches the window's location in logical coordinates.
-pub fn fetch_location<Message>(
+/// Fetches the current window position in logical coordinates.
+pub fn fetch_position<Message>(
     id: Id,
     f: impl FnOnce(Option<Point>) -> Message + 'static,
 ) -> Command<Message> {
-    Command::single(command::Action::Window(Action::FetchLocation(
+    Command::single(command::Action::Window(Action::FetchPosition(
         id,
         Box::new(f),
     )))
 }
 
+/// Moves the window to the given logical coordinates.
+pub fn move_to<Message>(id: Id, position: Point) -> Command<Message> {
+    Command::single(command::Action::Window(Action::Move(id, position)))
+}
+
 /// Changes the [`Mode`] of the window.
 pub fn change_mode<Message>(id: Id, mode: Mode) -> Command<Message> {
     Command::single(command::Action::Window(Action::ChangeMode(id, mode)))
diff --git a/runtime/src/window/action.rs b/runtime/src/window/action.rs
index 39eb1008..e44ff5a6 100644
--- a/runtime/src/window/action.rs
+++ b/runtime/src/window/action.rs
@@ -38,12 +38,12 @@ pub enum Action<T> {
     FetchMinimized(Id, Box<dyn FnOnce(Option<bool>) -> T + 'static>),
     /// Set the window to minimized or back
     Minimize(Id, bool),
+    /// Fetch the current logical coordinates of the window.
+    FetchPosition(Id, Box<dyn FnOnce(Option<Point>) -> T + 'static>),
     /// Move the window to the given logical coordinates.
     ///
     /// Unsupported on Wayland.
     Move(Id, Point),
-    /// Fetch the current logical coordinates of the window.
-    FetchLocation(Id, Box<dyn FnOnce(Option<Point>) -> T + 'static>),
     /// Change the [`Mode`] of the window.
     ChangeMode(Id, Mode),
     /// Fetch the current [`Mode`] of the window.
@@ -136,10 +136,10 @@ impl<T> Action<T> {
                 Action::FetchMinimized(id, Box::new(move |s| f(o(s))))
             }
             Self::Minimize(id, minimized) => Action::Minimize(id, minimized),
-            Self::Move(id, position) => Action::Move(id, position),
-            Self::FetchLocation(id, o) => {
-                Action::FetchLocation(id, Box::new(move |s| f(o(s))))
+            Self::FetchPosition(id, o) => {
+                Action::FetchPosition(id, Box::new(move |s| f(o(s))))
             }
+            Self::Move(id, position) => Action::Move(id, position),
             Self::ChangeMode(id, mode) => Action::ChangeMode(id, mode),
             Self::FetchMode(id, o) => {
                 Action::FetchMode(id, Box::new(move |s| f(o(s))))
@@ -191,12 +191,12 @@ impl<T> fmt::Debug for Action<T> {
             Self::Minimize(id, minimized) => {
                 write!(f, "Action::Minimize({id:?}, {minimized}")
             }
+            Self::FetchPosition(id, _) => {
+                write!(f, "Action::FetchPosition({id:?})")
+            }
             Self::Move(id, position) => {
                 write!(f, "Action::Move({id:?}, {position})")
             }
-            Self::FetchLocation(id, _) => {
-                write!(f, "Action::FetchLocation({id:?})")
-            }
             Self::ChangeMode(id, mode) => {
                 write!(f, "Action::SetMode({id:?}, {mode:?})")
             }
diff --git a/winit/src/application.rs b/winit/src/application.rs
index c86d1619..8d0d7456 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -767,19 +767,14 @@ pub fn run_command<A, C, E>(
                 window::Action::Minimize(_id, minimized) => {
                     window.set_minimized(minimized);
                 }
-                window::Action::Move(_id, position) => {
-                    window.set_outer_position(winit::dpi::LogicalPosition {
-                        x: position.x,
-                        y: position.y,
-                    });
-                }
-                window::Action::FetchLocation(_id, callback) => {
+                window::Action::FetchPosition(_id, callback) => {
                     let position = window
                         .inner_position()
-                        .map(|p| {
-                            let pos =
-                                p.to_logical::<f32>(window.scale_factor());
-                            crate::core::Point::new(pos.x, pos.y)
+                        .map(|position| {
+                            let position = position
+                                .to_logical::<f32>(window.scale_factor());
+
+                            crate::core::Point::new(position.x, position.y)
                         })
                         .ok();
 
@@ -787,6 +782,12 @@ pub fn run_command<A, C, E>(
                         .send_event(callback(position))
                         .expect("Send message to event loop");
                 }
+                window::Action::Move(_id, position) => {
+                    window.set_outer_position(winit::dpi::LogicalPosition {
+                        x: position.x,
+                        y: position.y,
+                    });
+                }
                 window::Action::ChangeMode(_id, mode) => {
                     window.set_visible(conversion::visible(mode));
                     window.set_fullscreen(conversion::fullscreen(
diff --git a/winit/src/multi_window.rs b/winit/src/multi_window.rs
index 3b00200b..c9056c9f 100644
--- a/winit/src/multi_window.rs
+++ b/winit/src/multi_window.rs
@@ -993,26 +993,17 @@ fn run_command<A, C, E>(
                         window.raw.set_minimized(minimized);
                     }
                 }
-                window::Action::Move(id, position) => {
-                    if let Some(window) = window_manager.get_mut(id) {
-                        window.raw.set_outer_position(
-                            winit::dpi::LogicalPosition {
-                                x: position.x,
-                                y: position.y,
-                            },
-                        );
-                    }
-                }
-                window::Action::FetchLocation(id, callback) => {
+                window::Action::FetchPosition(id, callback) => {
                     if let Some(window) = window_manager.get_mut(id) {
                         let position = window
                             .raw
                             .inner_position()
-                            .map(|p| {
-                                let pos = p.to_logical::<f32>(
+                            .map(|position| {
+                                let position = position.to_logical::<f32>(
                                     window.raw.scale_factor(),
                                 );
-                                crate::core::Point::new(pos.x, pos.y)
+
+                                crate::core::Point::new(position.x, position.y)
                             })
                             .ok();
 
@@ -1021,6 +1012,16 @@ fn run_command<A, C, E>(
                             .expect("Send message to event loop");
                     }
                 }
+                window::Action::Move(id, position) => {
+                    if let Some(window) = window_manager.get_mut(id) {
+                        window.raw.set_outer_position(
+                            winit::dpi::LogicalPosition {
+                                x: position.x,
+                                y: position.y,
+                            },
+                        );
+                    }
+                }
                 window::Action::ChangeMode(id, mode) => {
                     if let Some(window) = window_manager.get_mut(id) {
                         window.raw.set_visible(conversion::visible(mode));