chore: update modifiers

waycrate · Jul 31, 2024 · e2e4881 · e2e4881
1 parent 33fd1c6
commit e2e4881
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/iced_layershell/src/application.rs b/iced_layershell/src/application.rs
@@ -194,11 +194,8 @@ where
             // TODO: maybe use it later
             LayerEvent::BindProvide(_, _) => {}
             LayerEvent::RequestMessages(message) => {
-                match message {
-                    DispatchMessage::MouseEnter { serial, .. } => {
-                        pointer_serial = *serial;
-                    }
-                    _ => {}
+                if let DispatchMessage::MouseEnter { serial, .. } = message {
+                    pointer_serial = *serial;
                 }
 
                 event_sender

diff --git a/iced_layershell/src/application/state.rs b/iced_layershell/src/application/state.rs
@@ -97,6 +97,9 @@ where
             WindowEvent::CursorMoved { x, y } => {
                 self.mouse_position = Some(Point::new(*x as f32, *y as f32));
             }
+            WindowEvent::ModifiersChanged(modifiers) => {
+                self.modifiers = *modifiers;
+            }
             _ => {}
         }
     }

diff --git a/iced_layershell/src/conversion.rs b/iced_layershell/src/conversion.rs
@@ -73,7 +73,7 @@ pub fn window_event(
             }
         })),
         LayerShellEvent::ModifiersChanged(new_modifiers) => Some(IcedEvent::Keyboard(
-            keyboard::Event::ModifiersChanged(keymap::modifiers(new_modifiers.clone())),
+            keyboard::Event::ModifiersChanged(keymap::modifiers(*new_modifiers)),
         )),
         _ => None,
     }

diff --git a/iced_layershell/src/multi_window/state.rs b/iced_layershell/src/multi_window/state.rs
@@ -95,6 +95,9 @@ where
             WindowEvent::CursorMoved { x, y } => {
                 self.mouse_position = Some(Point::new(*x as f32, *y as f32));
             }
+            WindowEvent::ModifiersChanged(modifiers) => {
+                self.modifiers = *modifiers;
+            }
             _ => {}
         }
     }

diff --git a/iced_sessionlock/src/multi_window/state.rs b/iced_sessionlock/src/multi_window/state.rs
@@ -95,6 +95,9 @@ where
             WindowEvent::CursorMoved { x, y } => {
                 self.mouse_position = Some(Point::new(*x as f32, *y as f32));
             }
+            WindowEvent::ModifiersChanged(modifiers) => {
+                self.modifiers = modifiers.clone();
+            }
             _ => {}
         }
     }