mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-08 14:18:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use logical pixels for momentum velocity settings

Browse Source
This commit is contained in:
Kovid Goyal
2026-01-09 13:21:04 +05:30
parent 779fb0d5c5
commit c0add3198b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
glfw/momentum-scroll.c vendored
View File

@@ -29,6 +29,7 @@ typedef struct MomentumScroller {
GLFWid timer_id, window_id; GLFWid timer_id, window_id;
ScrollSamples samples; ScrollSamples samples;
ScrollerState state; ScrollerState state;
double scale;
struct { double x, y; } velocity; struct { double x, y; } velocity;
int keyboard_modifiers; int keyboard_modifiers;
struct { struct {
@@ -151,8 +152,8 @@ send_momentum_event(bool is_start) {
s.timer_id = 0; s.timer_id = 0;
} }
GLFWScrollEvent e = { GLFWScrollEvent e = {
.offset_type=GLFW_SCROLL_OFFEST_HIGHRES, .momentum_type=m, .x_offset=s.velocity.x, .y_offset=s.velocity.y, .offset_type=GLFW_SCROLL_OFFEST_HIGHRES, .momentum_type=m, .unscaled.x=s.velocity.x, .unscaled.y=s.velocity.y,
.keyboard_modifiers=s.keyboard_modifiers .x_offset=s.scale * s.velocity.x, .y_offset=s.scale * s.velocity.y, .keyboard_modifiers=s.keyboard_modifiers
}; };
_glfwInputScroll(w, &e); _glfwInputScroll(w, &e);
} }
@@ -198,6 +199,8 @@ glfw_handle_scroll_event_for_momentum(
memset(&s.physical_event, 0, sizeof(s.physical_event)); memset(&s.physical_event, 0, sizeof(s.physical_event));
s.physical_event.start = now; s.physical_event.start = now;
} }
if (ev->unscaled.y > 0) s.scale = ev->y_offset / ev->unscaled.y;
else if (ev->unscaled.x > 0) s.scale = ev->x_offset / ev->unscaled.x;
if (s.window_id && s.window_id != w->id) cancel_existing_scroll(true); if (s.window_id && s.window_id != w->id) cancel_existing_scroll(true);
if (s.state != PHYSICAL_EVENT_IN_PROGRESS) cancel_existing_scroll(false); if (s.state != PHYSICAL_EVENT_IN_PROGRESS) cancel_existing_scroll(false);
// Check for change in direction // Check for change in direction
@@ -206,7 +209,7 @@ glfw_handle_scroll_event_for_momentum(
s.window_id = w->id; s.window_id = w->id;
s.keyboard_modifiers = ev->keyboard_modifiers; s.keyboard_modifiers = ev->keyboard_modifiers;
if (ev->offset_type == GLFW_SCROLL_OFFEST_HIGHRES && s.friction > 0) { if (ev->offset_type == GLFW_SCROLL_OFFEST_HIGHRES && s.friction > 0) {
add_sample(ev->x_offset, ev->y_offset, now); add_sample(ev->unscaled.x, ev->unscaled.y, now);
if (stopped) s.state = is_suitable_for_momentum() ? MOMENTUM_IN_PROGRESS : NONE; if (stopped) s.state = is_suitable_for_momentum() ? MOMENTUM_IN_PROGRESS : NONE;
else s.state = PHYSICAL_EVENT_IN_PROGRESS; else s.state = PHYSICAL_EVENT_IN_PROGRESS;
} else { } else {