fix: cursor position

in this way, the real scale will always be 1.0
waycrate · Oct 7, 2024 · ffd11ad · ffd11ad
1 parent ffebb0e
commit ffd11ad
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 22 deletions.
diff --git a/iced_examples/counter_muti/src/main.rs b/iced_examples/counter_muti/src/main.rs
@@ -224,12 +224,12 @@ impl MultiApplication for Counter {
         let center = column![
             button("Increment").on_press(Message::IncrementPressed),
             button("Decrement").on_press(Message::DecrementPressed),
-            text(self.value).size(30),
+            text(self.value).size(50),
             button("newwindowLeft").on_press(Message::NewWindowLeft),
             button("newwindowRight").on_press(Message::NewWindowRight),
         ]
         .align_x(Alignment::Center)
-        .padding(10)
+        .padding(20)
         .width(Length::Fill)
         .height(Length::Fill);
         row![
@@ -253,7 +253,7 @@ impl MultiApplication for Counter {
                 .on_press(Message::Direction(WindowDirection::Right(id)))
                 .height(Length::Fill),
         ]
-        .padding(10)
+        .padding(20)
         .spacing(10)
         //.align_items(Alignment::Center)
         .width(Length::Fill)

diff --git a/iced_layershell/src/application/state.rs b/iced_layershell/src/application/state.rs
@@ -110,14 +110,10 @@ where
         &self.theme
     }
     pub fn application_scale_factor(&self) -> f64 {
-        self.application_scale_factor
+        1.
     }
     pub fn cursor(&self) -> IcedMouse::Cursor {
         self.mouse_position
-            .map(|point| Point {
-                x: point.x / self.application_scale_factor() as f32,
-                y: point.y / self.application_scale_factor() as f32,
-            })
             .map(IcedMouse::Cursor::Available)
             .unwrap_or(IcedMouse::Cursor::Unavailable)
     }

diff --git a/iced_layershell/src/multi_window.rs b/iced_layershell/src/multi_window.rs
@@ -661,7 +661,7 @@ async fn run_instance<A, E, C>(
                 window.state.update(&event);
                 if let Some(event) = conversion::window_event(
                     &event,
-                    window.state.application_scale_factor(),
+                    window.state.scale_factor(),
                     window.state.modifiers(),
                 ) {
                     events.push((Some(id), event));

diff --git a/iced_layershell/src/multi_window/state.rs b/iced_layershell/src/multi_window/state.rs
@@ -107,8 +107,8 @@ where
         self.viewport.logical_size()
     }
 
-    pub fn application_scale_factor(&self) -> f64 {
-        self.application_scale_factor
+    pub fn scale_factor(&self) -> f64 {
+        1.
     }
 
     pub fn text_color(&self) -> Color {
@@ -129,10 +129,6 @@ where
 
     pub fn cursor(&self) -> IcedMouse::Cursor {
         self.mouse_position
-            .map(|point| Point {
-                x: point.x / self.application_scale_factor() as f32,
-                y: point.y / self.application_scale_factor() as f32,
-            })
             .map(IcedMouse::Cursor::Available)
             .unwrap_or(IcedMouse::Cursor::Unavailable)
     }

diff --git a/iced_sessionlock/src/multi_window.rs b/iced_sessionlock/src/multi_window.rs
@@ -438,7 +438,7 @@ async fn run_instance<A, E, C>(
                 window.state.update(&event);
                 if let Some(event) = conversion::window_event(
                     &event,
-                    window.state.application_scale_factor(),
+                    window.state.scale_factor(),
                     window.state.modifiers(),
                 ) {
                     events.push((Some(id), event));

diff --git a/iced_sessionlock/src/multi_window/state.rs b/iced_sessionlock/src/multi_window/state.rs
@@ -106,8 +106,8 @@ where
         self.viewport.logical_size()
     }
 
-    pub fn application_scale_factor(&self) -> f64 {
-        self.application_scale_factor
+    pub fn scale_factor(&self) -> f64 {
+        1.
     }
 
     pub fn text_color(&self) -> Color {
@@ -124,10 +124,6 @@ where
 
     pub fn cursor(&self) -> IcedMouse::Cursor {
         self.mouse_position
-            .map(|point| Point {
-                x: point.x / self.application_scale_factor() as f32,
-                y: point.y / self.application_scale_factor() as f32,
-            })
             .map(IcedMouse::Cursor::Available)
             .unwrap_or(IcedMouse::Cursor::Unavailable)
     }