diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2024-11-10 09:14:22 +0300 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2024-11-10 09:14:22 +0300 |
| commit | 1951d2a9f262196a706f2645efb18dac3c4d6839 (patch) | |
| tree | 3bd3237a22f516498eed5f8d84acdeb4ee3317bd /src/input | |
| parent | 9d8f640503819ff1905c9040d3c7910a50400bbd (diff) | |
| download | niri-1951d2a9f262196a706f2645efb18dac3c4d6839.tar.gz niri-1951d2a9f262196a706f2645efb18dac3c4d6839.tar.bz2 niri-1951d2a9f262196a706f2645efb18dac3c4d6839.zip | |
Fix scrolling not working with missing mouse config
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/mod.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/input/mod.rs b/src/input/mod.rs index 9c668318..3cbb3983 100644 --- a/src/input/mod.rs +++ b/src/input/mod.rs @@ -1882,10 +1882,11 @@ impl State { } let scroll_factor = match source { - AxisSource::Wheel => self.niri.config.borrow().input.mouse.scroll_factor.0, - AxisSource::Finger => self.niri.config.borrow().input.touchpad.scroll_factor.0, - _ => 1.0, + AxisSource::Wheel => self.niri.config.borrow().input.mouse.scroll_factor, + AxisSource::Finger => self.niri.config.borrow().input.touchpad.scroll_factor, + _ => None, }; + let scroll_factor = scroll_factor.map(|x| x.0).unwrap_or(1.); let horizontal_amount = horizontal_amount.unwrap_or_else(|| { // Winit backend, discrete scrolling. |