diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2025-09-30 09:01:44 +0300 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2025-10-02 09:38:17 +0300 |
| commit | 2eabc22b3831265bec4e4a0d5ed5e9c0a00f50ab (patch) | |
| tree | c28ffaa413de153e8b586ad66beb67660edb4ffd /src | |
| parent | 2de34e8798d18321cc36bde97960ef1a9958bca0 (diff) | |
| download | niri-2eabc22b3831265bec4e4a0d5ed5e9c0a00f50ab.tar.gz niri-2eabc22b3831265bec4e4a0d5ed5e9c0a00f50ab.tar.bz2 niri-2eabc22b3831265bec4e4a0d5ed5e9c0a00f50ab.zip | |
config: Add merging for Gestures
Diffstat (limited to 'src')
| -rw-r--r-- | src/layout/monitor.rs | 4 | ||||
| -rw-r--r-- | src/layout/scrolling.rs | 2 | ||||
| -rw-r--r-- | src/layout/workspace.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/layout/monitor.rs b/src/layout/monitor.rs index 5e463a7e..8f322e9e 100644 --- a/src/layout/monitor.rs +++ b/src/layout/monitor.rs @@ -1904,7 +1904,7 @@ impl<W: LayoutElement> Monitor<W> { }; let config = &self.options.gestures.dnd_edge_workspace_switch; - let trigger_height = config.trigger_height.0; + let trigger_height = config.trigger_height; // Restrict the scrolling horizontally to the strip of workspaces to avoid unwanted trigger // after using the hot corner or during horizontal scroll. @@ -1958,7 +1958,7 @@ impl<W: LayoutElement> Monitor<W> { let time_delta = now.saturating_sub(last_time).as_secs_f64(); - let delta = delta * time_delta * config.max_speed.0; + let delta = delta * time_delta * config.max_speed; gesture.tracker.push(delta, now); diff --git a/src/layout/scrolling.rs b/src/layout/scrolling.rs index 9c483e72..02541d1b 100644 --- a/src/layout/scrolling.rs +++ b/src/layout/scrolling.rs @@ -3045,7 +3045,7 @@ impl<W: LayoutElement> ScrollingSpace<W> { let time_delta = now.saturating_sub(last_time).as_secs_f64(); - let delta = delta * time_delta * config.max_speed.0; + let delta = delta * time_delta * config.max_speed; gesture.tracker.push(delta, now); diff --git a/src/layout/workspace.rs b/src/layout/workspace.rs index 5bdd2624..32ce3c9e 100644 --- a/src/layout/workspace.rs +++ b/src/layout/workspace.rs @@ -1766,7 +1766,7 @@ impl<W: LayoutElement> Workspace<W> { pub fn dnd_scroll_gesture_scroll(&mut self, pos: Point<f64, Logical>, speed: f64) -> bool { let config = &self.options.gestures.dnd_edge_view_scroll; - let trigger_width = config.trigger_width.0; + let trigger_width = config.trigger_width; // This working area intentionally does not include extra struts from Options. let x = pos.x - self.working_area.loc.x; |