diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2024-03-23 08:49:58 +0400 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2024-03-23 08:49:58 +0400 |
| commit | b09dbb80c7c507f34e194f2c5420054608cbf732 (patch) | |
| tree | 1bb00a0d8f0e022339b45778c61b9b7d01cb7169 /src/input.rs | |
| parent | 54e6a01284effb5d1addc3ad386f124afa9aade2 (diff) | |
| download | niri-b09dbb80c7c507f34e194f2c5420054608cbf732.tar.gz niri-b09dbb80c7c507f34e194f2c5420054608cbf732.tar.bz2 niri-b09dbb80c7c507f34e194f2c5420054608cbf732.zip | |
[cfg-breaking] Rename Wheel* to WheelScroll* bindings
Less confusion, and clearer that they are affected by natural-scroll.
Diffstat (limited to 'src/input.rs')
| -rw-r--r-- | src/input.rs | 13 |
1 files changed, 8 insertions, 5 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() { |