From baf70da2feab5371f8af2aefd63fe8e9a761bdb5 Mon Sep 17 00:00:00 2001 From: dignow <136106582+dignow@users.noreply.github.com> Date: Thu, 25 Jul 2024 14:44:58 +0800 Subject: [PATCH] fix: trackpad, reverse horizontal scroll (#8827) Signed-off-by: dignow --- src/server/input_service.rs | 3 +-- src/ui_session_interface.rs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/server/input_service.rs b/src/server/input_service.rs index 30a885663..eabb8844e 100644 --- a/src/server/input_service.rs +++ b/src/server/input_service.rs @@ -973,12 +973,11 @@ pub fn handle_mouse_(evt: &MouseEvent, conn: i32) { }, MOUSE_TYPE_WHEEL | MOUSE_TYPE_TRACKPAD => { #[allow(unused_mut)] - let mut x = evt.x; + let mut x = -evt.x; #[allow(unused_mut)] let mut y = evt.y; #[cfg(not(windows))] { - x = -x; y = -y; } diff --git a/src/ui_session_interface.rs b/src/ui_session_interface.rs index 38144d5db..4f39cd36c 100644 --- a/src/ui_session_interface.rs +++ b/src/ui_session_interface.rs @@ -1018,7 +1018,7 @@ impl Session { } } - let (x, y) = if mask == MOUSE_TYPE_WHEEL { + let (x, y) = if mask == MOUSE_TYPE_WHEEL || mask == MOUSE_TYPE_TRACKPAD { self.get_scroll_xy((x, y)) } else { (x, y)