Allow arrow keys to move away focus from a Slider

EmbarkStudios · Nov 27, 2023 · f3da3ab · f3da3ab
1 parent 4dc964a
commit f3da3ab
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 12 deletions.
diff --git a/crates/egui/src/data/input.rs b/crates/egui/src/data/input.rs
@@ -1238,11 +1238,17 @@ pub struct EventFilter {
     /// Default: `false`
     pub tab: bool,
 
-    /// If `true`, pressing arrows will act on the widget,
-    /// and NOT move focus away from the focused widget.
+    /// If `true`, pressing horizontal arrows will act on the
+    /// widget, and NOT move focus away from the focused widget.
+    ///
+    /// Default: `false`
+    pub horizontal_arrows: bool,
+
+    /// If `true`, pressing vertical arrows will act on the
+    /// widget, and NOT move focus away from the focused widget.
     ///
     /// Default: `false`
-    pub arrows: bool,
+    pub vertical_arrows: bool,
 
     /// If `true`, pressing escape will act on the widget,
     /// and NOT surrender focus from the focused widget.
@@ -1256,7 +1262,8 @@ impl Default for EventFilter {
     fn default() -> Self {
         Self {
             tab: false,
-            arrows: false,
+            horizontal_arrows: false,
+            vertical_arrows: false,
             escape: false,
         }
     }
@@ -1267,10 +1274,8 @@ impl EventFilter {
         if let Event::Key { key, .. } = event {
             match key {
                 crate::Key::Tab => self.tab,
-                crate::Key::ArrowUp
-                | crate::Key::ArrowRight
-                | crate::Key::ArrowDown
-                | crate::Key::ArrowLeft => self.arrows,
+                crate::Key::ArrowUp | crate::Key::ArrowDown => self.vertical_arrows,
+                crate::Key::ArrowRight | crate::Key::ArrowLeft => self.horizontal_arrows,
                 crate::Key::Escape => self.escape,
                 _ => true,
             }

diff --git a/crates/egui/src/memory.rs b/crates/egui/src/memory.rs
@@ -675,7 +675,8 @@ impl Memory {
             id,
             EventFilter {
                 tab: lock_focus,
-                arrows: lock_focus,
+                horizontal_arrows: lock_focus,
+                vertical_arrows: lock_focus,
                 escape: false,
             },
         );

diff --git a/crates/egui/src/widgets/slider.rs b/crates/egui/src/widgets/slider.rs
@@ -609,7 +609,13 @@ impl<'a> Slider<'a> {
                 m.set_focus_lock_filter(
                     response.id,
                     EventFilter {
-                        arrows: true, // pressing arrows should not move focus to next widget
+                        // pressing arrows in the orientation of the
+                        // slider should not move focus to next widget
+                        horizontal_arrows: matches!(
+                            self.orientation,
+                            SliderOrientation::Horizontal
+                        ),
+                        vertical_arrows: matches!(self.orientation, SliderOrientation::Vertical),
                         ..Default::default()
                     },
                 );

diff --git a/crates/egui/src/widgets/text_edit/builder.rs b/crates/egui/src/widgets/text_edit/builder.rs
@@ -118,8 +118,10 @@ impl<'t> TextEdit<'t> {
             desired_width: None,
             desired_height_rows: 4,
             event_filter: EventFilter {
-                arrows: true, // moving the cursor is really important
-                tab: false,   // tab is used to change focus, not to insert a tab character
+                // moving the cursor is really important
+                horizontal_arrows: true,
+                vertical_arrows: true,
+                tab: false, // tab is used to change focus, not to insert a tab character
                 ..Default::default()
             },
             cursor_at_end: true,