chore: adjust some code

waycrate · Oct 6, 2024 · 0e29dc0 · 0e29dc0
1 parent 0a461ac
commit 0e29dc0
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/iced_layershell/src/event.rs b/iced_layershell/src/event.rs
@@ -40,7 +40,7 @@ impl From<WEnum<KeyState>> for IcedKeyState {
 #[derive(Debug, Clone)]
 pub enum WindowEvent {
     ScaleFactorChanged {
-        scale_int: u32,
+        scale_u32: u32,
         scale_float: f64,
     },
     CursorEnter {
@@ -190,10 +190,10 @@ impl<Message: 'static, INFO: Clone> From<&DispatchMessage> for IcedLayerEvent<Me
             }
 
             DispatchMessage::PreferredScale {
-                scale_int,
+                scale_u32,
                 scale_float,
             } => IcedLayerEvent::Window(WindowEvent::ScaleFactorChanged {
-                scale_int: *scale_int,
+                scale_u32: *scale_u32,
                 scale_float: *scale_float,
             }),
 

diff --git a/iced_sessionlock/src/event.rs b/iced_sessionlock/src/event.rs
@@ -30,7 +30,7 @@ impl From<WEnum<KeyState>> for IcedKeyState {
 #[derive(Debug, Clone)]
 pub enum WindowEvent {
     ScaleFactorChanged {
-        scale_int: u32,
+        scale_u32: u32,
         scale_float: f64,
     },
     CursorEnter {
@@ -173,9 +173,9 @@ impl<Message: 'static> From<&DispatchMessage> for IcedSessionLockEvent<Message>
             }
             DispatchMessage::PreferredScale {
                 scale_float,
-                scale_int,
+                scale_u32,
             } => IcedSessionLockEvent::Window(WindowEvent::ScaleFactorChanged {
-                scale_int: *scale_int,
+                scale_u32: *scale_u32,
                 scale_float: *scale_float,
             }),
             DispatchMessage::KeyboardInput {

diff --git a/layershellev/src/events.rs b/layershellev/src/events.rs
@@ -243,7 +243,7 @@ pub(crate) enum DispatchMessageInner {
         scale_float: f64,
     },
     PreferredScale {
-        scale_int: u32,
+        scale_u32: u32,
         scale_float: f64,
     },
     XdgInfoChanged(XdgInfoChangedType),
@@ -327,7 +327,7 @@ pub enum DispatchMessage {
         scale_float: f64,
     },
     /// fractal scale handle
-    PreferredScale { scale_int: u32, scale_float: f64 },
+    PreferredScale { scale_u32: u32, scale_float: f64 },
 }
 
 impl From<DispatchMessageInner> for DispatchMessage {
@@ -431,10 +431,10 @@ impl From<DispatchMessageInner> for DispatchMessage {
                 is_synthetic,
             },
             DispatchMessageInner::PreferredScale {
-                scale_int,
+                scale_u32,
                 scale_float,
             } => DispatchMessage::PreferredScale {
-                scale_int,
+                scale_u32,
                 scale_float,
             },
             DispatchMessageInner::RefreshSurface { .. } => unimplemented!(),

diff --git a/layershellev/src/lib.rs b/layershellev/src/lib.rs
@@ -1671,7 +1671,7 @@ impl<T> Dispatch<wp_fractional_scale_v1::WpFractionalScaleV1, ()> for WindowStat
             state.message.push((
                 Some(id),
                 DispatchMessageInner::PreferredScale {
-                    scale_int: scale,
+                    scale_u32: scale,
                     scale_float: scale as f64 / 120.,
                 },
             ));

diff --git a/sessionlockev/src/events.rs b/sessionlockev/src/events.rs
@@ -177,7 +177,7 @@ pub(crate) enum DispatchMessageInner {
     },
     PreferredScale {
         scale_float: f64,
-        scale_int: u32,
+        scale_u32: u32,
     },
 }
 
@@ -268,7 +268,7 @@ pub enum DispatchMessage {
     /// fractal scale handle
     PreferredScale {
         scale_float: f64,
-        scale_int: u32,
+        scale_u32: u32,
     },
 }
 
@@ -374,10 +374,10 @@ impl From<DispatchMessageInner> for DispatchMessage {
             },
             DispatchMessageInner::PreferredScale {
                 scale_float,
-                scale_int,
+                scale_u32,
             } => DispatchMessage::PreferredScale {
                 scale_float,
-                scale_int,
+                scale_u32,
             },
             DispatchMessageInner::RefreshSurface { .. } => unimplemented!(),
         }

diff --git a/sessionlockev/src/lib.rs b/sessionlockev/src/lib.rs
@@ -1056,7 +1056,7 @@ impl<T> Dispatch<wp_fractional_scale_v1::WpFractionalScaleV1, ()> for WindowStat
                 Some(unit.id),
                 DispatchMessageInner::PreferredScale {
                     scale_float: scale as f64 / 120.,
-                    scale_int: scale,
+                    scale_u32: scale,
                 },
             ));
         }