ayo/kitty
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #7481

Browse source
This commit is contained in:
Kovid Goyal 2024-05-28 15:14:13 +05:30
parent 57b6cec900
commit 48070ff38e
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/changelog.rst
View file

@ -55,7 +55,7 @@ Detailed list of changes
- Wayland: Fix a regression in 0.34 that caused the tab bar to not render in second and subsequent OS Windows under Hyprland (:iss:`7413`)
- macOS: Fix a regression in the previous release that caused horizontal scrolling via touchpad in fullscreen applications to be reversed (:iss:`7475`)
- Fix a regression in the previous release that caused horizontal scrolling via touchpad in fullscreen applications to be reversed on non-Wayland platforms (:iss:`7475`, :iss:`7481`)
0.35.0 [2024-05-25]

2
glfw/wl_init.c vendored
View file

@ -224,7 +224,7 @@ pointer_handle_frame(void *data UNUSED, struct wl_pointer *pointer UNUSED) {
if (x != 0.0f || y != 0.0f) {
float scale = (float)_glfwWaylandWindowScale(window);
y *= scale; x *= scale;
_glfwInputScroll(window, x, y, highres, _glfw.wl.xkb.states.modifiers);
_glfwInputScroll(window, -x, y, highres, _glfw.wl.xkb.states.modifiers);
}
}

4
kitty/mouse.c
View file

@ -973,11 +973,7 @@ scroll_event(double xoffset, double yoffset, int flags, int modifiers) {
s = scale_scroll(screen->modes.mouse_tracking_mode, xoffset, is_high_resolution, &screen->pending_scroll_pixels_x, global_state.callback_os_window->fonts_data->cell_width);
if (s) {
if (screen->modes.mouse_tracking_mode) {
#ifdef __APPLE__
int sz = encode_mouse_scroll(w, s > 0 ? 6 : 7, modifiers);
#else
int sz = encode_mouse_scroll(w, s < 0 ? 6 : 7, modifiers);
#endif
if (sz > 0) {
mouse_event_buf[sz] = 0;
for (s = abs(s); s > 0; s--) {