Fix modifiers in sdl3 by adding optional 'modifiers' field in KeyChan…

…ged. Closes #200.
SecondHalfGames · Jan 25, 2025 · ceb3dd9 · ceb3dd9
1 parent 693d7c2
commit ceb3dd9
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 14 deletions.
diff --git a/crates/yakui-core/src/event.rs b/crates/yakui-core/src/event.rs
@@ -37,6 +37,9 @@ pub enum Event {
 
         /// Whether the key is now down.
         down: bool,
+
+        /// Modifiers pressed for this event.
+        modifiers: Option<Modifiers>,
     },
 
     /// The state of the keyboard modifiers keys changed.

diff --git a/crates/yakui-core/src/input/input_state.rs b/crates/yakui-core/src/input/input_state.rs
@@ -182,7 +182,11 @@ impl InputState {
                 response
             }
             Event::MouseScroll { delta } => self.send_mouse_scroll(dom, layout, *delta),
-            Event::KeyChanged { key, down } => self.keyboard_key_changed(dom, layout, *key, *down),
+            Event::KeyChanged {
+                key,
+                down,
+                modifiers,
+            } => self.keyboard_key_changed(dom, layout, *key, *down, *modifiers),
             Event::ModifiersChanged(modifiers) => self.modifiers_changed(modifiers),
             Event::TextInput(c) => self.text_input(dom, layout, *c),
             _ => EventResponse::Bubble,
@@ -278,6 +282,7 @@ impl InputState {
         layout: &LayoutDom,
         key: KeyCode,
         down: bool,
+        modifiers: Option<Modifiers>,
     ) -> EventResponse {
         let selected = self.selection.get();
         if let Some(id) = selected {
@@ -295,7 +300,7 @@ impl InputState {
                 let event = WidgetEvent::KeyChanged {
                     key,
                     down,
-                    modifiers: self.modifiers.get(),
+                    modifiers: modifiers.unwrap_or(self.modifiers.get()),
                 };
                 return self.fire_event(dom, layout, id, &mut node, &event);
             }

diff --git a/crates/yakui-sdl2/src/lib.rs b/crates/yakui-sdl2/src/lib.rs
@@ -5,9 +5,9 @@ use sdl2::mouse::MouseButton as SdlMouseButton;
 use sdl2::video::Window;
 use yakui_core::event::Event;
 use yakui_core::geometry::{Rect, UVec2, Vec2};
-use yakui_core::input::MouseButton;
+use yakui_core::input::{Modifiers, MouseButton};
 
-use self::keys::from_sdl_scancode;
+use self::keys::{from_sdl_modifiers, from_sdl_scancode};
 
 pub struct YakuiSdl2 {
     init: Option<InitState>,
@@ -110,17 +110,29 @@ impl YakuiSdl2 {
                 false
             }
 
-            SdlEvent::KeyDown { scancode, .. } => {
+            SdlEvent::KeyDown {
+                scancode, keymod, ..
+            } => {
                 if let Some(key) = scancode.and_then(from_sdl_scancode) {
-                    state.handle_event(Event::KeyChanged { key, down: true })
+                    state.handle_event(Event::KeyChanged {
+                        key,
+                        down: true,
+                        modifiers: Some(from_sdl_modifiers(*keymod)),
+                    })
                 } else {
                     false
                 }
             }
 
-            SdlEvent::KeyUp { scancode, .. } => {
+            SdlEvent::KeyUp {
+                scancode, keymod, ..
+            } => {
                 if let Some(key) = scancode.and_then(from_sdl_scancode) {
-                    state.handle_event(Event::KeyChanged { key, down: false })
+                    state.handle_event(Event::KeyChanged {
+                        key,
+                        down: false,
+                        modifiers: Some(from_sdl_modifiers(*keymod)),
+                    })
                 } else {
                     false
                 }

diff --git a/crates/yakui-sdl3/src/lib.rs b/crates/yakui-sdl3/src/lib.rs
@@ -9,7 +9,7 @@ use yakui_core::event::Event;
 use yakui_core::geometry::{Rect, UVec2, Vec2};
 use yakui_core::input::MouseButton;
 
-use self::keys::from_sdl_scancode;
+use self::keys::{from_sdl_modifiers, from_sdl_scancode};
 
 pub struct YakuiSdl3 {
     init: Option<InitState>,
@@ -122,17 +122,29 @@ impl YakuiSdl3 {
                 false
             }
 
-            SdlEvent::KeyDown { scancode, .. } => {
+            SdlEvent::KeyDown {
+                scancode, keymod, ..
+            } => {
                 if let Some(key) = scancode.and_then(from_sdl_scancode) {
-                    state.handle_event(Event::KeyChanged { key, down: true })
+                    state.handle_event(Event::KeyChanged {
+                        key,
+                        down: true,
+                        modifiers: Some(from_sdl_modifiers(*keymod)),
+                    })
                 } else {
                     false
                 }
             }
 
-            SdlEvent::KeyUp { scancode, .. } => {
+            SdlEvent::KeyUp {
+                scancode, keymod, ..
+            } => {
                 if let Some(key) = scancode.and_then(from_sdl_scancode) {
-                    state.handle_event(Event::KeyChanged { key, down: false })
+                    state.handle_event(Event::KeyChanged {
+                        key,
+                        down: false,
+                        modifiers: Some(from_sdl_modifiers(*keymod)),
+                    })
                 } else {
                     false
                 }

diff --git a/crates/yakui-widgets/src/widgets/textbox.rs b/crates/yakui-widgets/src/widgets/textbox.rs
@@ -468,6 +468,8 @@ impl Widget for TextBoxWidget {
                 modifiers,
                 ..
             } => {
+                println!("Key: {key:?} {down:?} + {modifiers:?}");
+
                 let fonts = ctx.dom.get_global_or_init(Fonts::default);
                 fonts.with_system(|font_system| {
                     if let Some(editor) = self.cosmic_editor.get_mut() {

diff --git a/crates/yakui-winit/src/lib.rs b/crates/yakui-winit/src/lib.rs
@@ -150,7 +150,11 @@ impl YakuiWinit {
                         ElementState::Released => false,
                     };
 
-                    state.handle_event(Event::KeyChanged { key, down: pressed })
+                    state.handle_event(Event::KeyChanged {
+                        key,
+                        down: pressed,
+                        modifiers: None,
+                    })
                 } else {
                     false
                 }