melissa/zsa_qmk_firmware
1
0
Fork 0
mirror of https://github.com/zsa/qmk_firmware.git synced 2026-05-04 14:55:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(scrolling): smoother scrolling

Browse Source
This commit is contained in:
Florian Didron
2025-11-24 15:27:41 +07:00
parent efca17713b
commit 9773680394
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/sensors/navigator_trackpad.c
View File

@@ -483,7 +483,6 @@ report_mouse_t navigator_trackpad_get_report(report_mouse_t mouse_report) {
// Determine mode based on finger count // Determine mode based on finger count
if (fingers >= 2 && gesture.state != TP_SCROLLING) { if (fingers >= 2 && gesture.state != TP_SCROLLING) {
gesture.state = TP_SCROLLING; gesture.state = TP_SCROLLING;
set_scrolling = true;
} }
uint16_t duration = timer_elapsed(gesture.touch_start_time); uint16_t duration = timer_elapsed(gesture.touch_start_time);
@@ -512,8 +511,33 @@ report_mouse_t navigator_trackpad_get_report(report_mouse_t mouse_report) {
int16_t delta_y = ptp_report.fingers[0].y - gesture.prev_y; int16_t delta_y = ptp_report.fingers[0].y - gesture.prev_y;
if (delta_x != 0 || delta_y != 0) { if (delta_x != 0 || delta_y != 0) {
mouse_report.x = (delta_x < 0) ? -powf(-delta_x, 1.2) : powf(delta_x, 1.2); if (gesture.state == TP_SCROLLING) {
mouse_report.y = (delta_y < 0) ? -powf(-delta_y, 1.2) : powf(delta_y, 1.2); // Two-finger scroll: output directly to h/v for high-res scrolling
// With high-res scrolling enabled, the OS divides by 120 to get ticks
// Apply multiplier to adjust scroll speed
int16_t scroll_x = delta_x * NAVIGATOR_TRACKPAD_SCROLL_MULTIPLIER;
int16_t scroll_y = delta_y * NAVIGATOR_TRACKPAD_SCROLL_MULTIPLIER;
// Clamp to int8_t range for the report
scroll_x = (scroll_x > 127) ? 127 : ((scroll_x < -127) ? -127 : scroll_x);
scroll_y = (scroll_y > 127) ? 127 : ((scroll_y < -127) ? -127 : scroll_y);
# ifdef NAVIGATOR_TRACKPAD_GESTURE_DEBUG
if (scroll_x != 0 || scroll_y != 0) {
printf("SCROLL: delta=%d,%d *%d -> h=%d v=%d\n",
delta_x, delta_y, NAVIGATOR_TRACKPAD_SCROLL_MULTIPLIER, -scroll_x, scroll_y);
}
# endif
mouse_report.h = -scroll_x; // Invert for natural scrolling
mouse_report.v = scroll_y;
mouse_report.x = 0;
mouse_report.y = 0;
} else {
// One-finger movement: mouse cursor
mouse_report.x = (delta_x < 0) ? -powf(-delta_x, 1.2) : powf(delta_x, 1.2);
mouse_report.y = (delta_y < 0) ? -powf(-delta_y, 1.2) : powf(delta_y, 1.2);
}
} }
} }

4
drivers/sensors/navigator_trackpad.h
View File

@@ -100,6 +100,10 @@
# define NAVIGATOR_TRACKPAD_SCROLL_DIVIDER 10 # define NAVIGATOR_TRACKPAD_SCROLL_DIVIDER 10
#endif #endif
#ifndef NAVIGATOR_TRACKPAD_SCROLL_MULTIPLIER
# define NAVIGATOR_TRACKPAD_SCROLL_MULTIPLIER 4
#endif
#if defined(NAVIGATOR_TRACKPAD_PTP_MODE) #if defined(NAVIGATOR_TRACKPAD_PTP_MODE)
# ifndef MOUSE_EXTENDED_REPORT # ifndef MOUSE_EXTENDED_REPORT
# define MOUSE_EXTENDED_REPORT # define MOUSE_EXTENDED_REPORT