aboutsummaryrefslogtreecommitdiff
path: root/niri-config/src/lib.rs
diff options
context:
space:
mode:
authorIvan Molodetskikh <yalterz@gmail.com>2025-09-30 09:01:44 +0300
committerIvan Molodetskikh <yalterz@gmail.com>2025-10-02 09:38:17 +0300
commit2eabc22b3831265bec4e4a0d5ed5e9c0a00f50ab (patch)
treec28ffaa413de153e8b586ad66beb67660edb4ffd /niri-config/src/lib.rs
parent2de34e8798d18321cc36bde97960ef1a9958bca0 (diff)
downloadniri-2eabc22b3831265bec4e4a0d5ed5e9c0a00f50ab.tar.gz
niri-2eabc22b3831265bec4e4a0d5ed5e9c0a00f50ab.tar.bz2
niri-2eabc22b3831265bec4e4a0d5ed5e9c0a00f50ab.zip
config: Add merging for Gestures
Diffstat (limited to 'niri-config/src/lib.rs')
-rw-r--r--niri-config/src/lib.rs18
1 files changed, 5 insertions, 13 deletions
diff --git a/niri-config/src/lib.rs b/niri-config/src/lib.rs
index 7a07b71b..ab63361d 100644
--- a/niri-config/src/lib.rs
+++ b/niri-config/src/lib.rs
@@ -192,7 +192,7 @@ where
"hotkey-overlay" => m_merge!(hotkey_overlay),
"config-notification" => m_merge!(config_notification),
"animations" => m_replace!(animations),
- "gestures" => m_replace!(gestures),
+ "gestures" => m_merge!(gestures),
"overview" => m_merge!(overview),
"xwayland-satellite" => m_merge!(xwayland_satellite),
"switch-events" => m_merge!(switch_events),
@@ -1433,22 +1433,14 @@ mod tests {
},
gestures: Gestures {
dnd_edge_view_scroll: DndEdgeViewScroll {
- trigger_width: FloatOrInt(
- 10.0,
- ),
+ trigger_width: 10.0,
delay_ms: 100,
- max_speed: FloatOrInt(
- 50.0,
- ),
+ max_speed: 50.0,
},
dnd_edge_workspace_switch: DndEdgeWorkspaceSwitch {
- trigger_height: FloatOrInt(
- 50.0,
- ),
+ trigger_height: 50.0,
delay_ms: 100,
- max_speed: FloatOrInt(
- 1500.0,
- ),
+ max_speed: 1500.0,
},
hot_corners: HotCorners {
off: false,