From 1951d2a9f262196a706f2645efb18dac3c4d6839 Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Sun, 10 Nov 2024 09:14:22 +0300 Subject: Fix scrolling not working with missing mouse config --- src/input/mod.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/input') 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. -- cgit