diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/input.rs | 13 | ||||
| -rw-r--r-- | src/ui/hotkey_overlay.rs | 8 |
2 files changed, 12 insertions, 9 deletions
diff --git a/src/input.rs b/src/input.rs index b4e44974..fd19e5c4 100644 --- a/src/input.rs +++ b/src/input.rs @@ -1116,7 +1116,7 @@ impl State { let horizontal_amount_v120 = event.amount_v120(Axis::Horizontal); let vertical_amount_v120 = event.amount_v120(Axis::Vertical); - // Handle wheel bindings. + // Handle wheel scroll bindings. if source == AxisSource::Wheel { let comp_mod = self.backend.mod_key(); let mods = self.niri.seat.get_keyboard().unwrap().modifier_state(); @@ -1124,9 +1124,10 @@ impl State { if let Some(v120) = horizontal_amount_v120 { let config = self.niri.config.borrow(); let bindings = &config.binds; - let bind_left = find_configured_bind(bindings, comp_mod, Trigger::WheelLeft, mods); + let bind_left = + find_configured_bind(bindings, comp_mod, Trigger::WheelScrollLeft, mods); let bind_right = - find_configured_bind(bindings, comp_mod, Trigger::WheelRight, mods); + find_configured_bind(bindings, comp_mod, Trigger::WheelScrollRight, mods); drop(config); // If we have a bind with current modifiers along the scroll direction, then @@ -1152,8 +1153,10 @@ impl State { if let Some(v120) = vertical_amount_v120 { let config = self.niri.config.borrow(); let bindings = &config.binds; - let bind_up = find_configured_bind(bindings, comp_mod, Trigger::WheelUp, mods); - let bind_down = find_configured_bind(bindings, comp_mod, Trigger::WheelDown, mods); + let bind_up = + find_configured_bind(bindings, comp_mod, Trigger::WheelScrollUp, mods); + let bind_down = + find_configured_bind(bindings, comp_mod, Trigger::WheelScrollDown, mods); drop(config); if bind_up.is_some() || bind_down.is_some() { diff --git a/src/ui/hotkey_overlay.rs b/src/ui/hotkey_overlay.rs index f054b3cf..2f658dc3 100644 --- a/src/ui/hotkey_overlay.rs +++ b/src/ui/hotkey_overlay.rs @@ -417,10 +417,10 @@ fn key_name(comp_mod: CompositorMod, key: &Key) -> String { let pretty = match key.trigger { Trigger::Keysym(keysym) => prettify_keysym_name(&keysym_get_name(keysym)), - Trigger::WheelDown => String::from("Wheel Down"), - Trigger::WheelUp => String::from("Wheel Up"), - Trigger::WheelLeft => String::from("Wheel Left"), - Trigger::WheelRight => String::from("Wheel Right"), + Trigger::WheelScrollDown => String::from("Wheel Scroll Down"), + Trigger::WheelScrollUp => String::from("Wheel Scroll Up"), + Trigger::WheelScrollLeft => String::from("Wheel Scroll Left"), + Trigger::WheelScrollRight => String::from("Wheel Scroll Right"), }; name.push_str(&pretty); |