andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-23 02:05:33 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Reformat scroll factor computation

Browse Source
This commit is contained in:
Ivan Molodetskikh
2025-04-20 12:37:31 +03:00
parent ffd6acc0aa
commit ee4c5e23ab
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/input/mod.rs
+3 -2
View File
@@ -2571,13 +2571,14 @@ impl State {
AxisSource::Finger => self.niri.config.borrow().input.touchpad.scroll_factor, AxisSource::Finger => self.niri.config.borrow().input.touchpad.scroll_factor,
_ => None, _ => None,
}; };
let scroll_factor = scroll_factor.map(|x| x.0).unwrap_or(1.);
let window_scroll_factor = pointer let window_scroll_factor = pointer
.current_focus() .current_focus()
.map(|focused| self.niri.find_root_shell_surface(&focused)) .map(|focused| self.niri.find_root_shell_surface(&focused))
.and_then(|root| self.niri.layout.find_window_and_output(&root).unzip().0) .and_then(|root| self.niri.layout.find_window_and_output(&root).unzip().0)
.and_then(|window| window.rules().scroll_factor); .and_then(|window| window.rules().scroll_factor);
let scroll_factor = let scroll_factor = scroll_factor * window_scroll_factor.unwrap_or(1.);
scroll_factor.map(|x| x.0).unwrap_or(1.) * window_scroll_factor.unwrap_or(1.);
let horizontal_amount = horizontal_amount.unwrap_or_else(|| { let horizontal_amount = horizontal_amount.unwrap_or_else(|| {
// Winit backend, discrete scrolling. // Winit backend, discrete scrolling.