diff --git a/docs/changelog.rst b/docs/changelog.rst index fe7127a2e..a560b0abd 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -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] diff --git a/glfw/wl_init.c b/glfw/wl_init.c index bcd66e3c7..1f1382f70 100644 --- a/glfw/wl_init.c +++ b/glfw/wl_init.c @@ -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); } } diff --git a/kitty/mouse.c b/kitty/mouse.c index 99bc90f85..37323e6c8 100644 --- a/kitty/mouse.c +++ b/kitty/mouse.c @@ -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--) {