From 746223427ec1b77353a2005032b7bfafb512249f Mon Sep 17 00:00:00 2001 From: bbb651 <53972231+bbb651@users.noreply.github.com> Date: Fri, 17 May 2024 00:43:46 +0300 Subject: [PATCH] wayland: Don't reinvert inverted scroll axes (#11937) Release Notes: - Wayland: Fixed Natural Scrolling Being Wrongly Reinverted ([#11874](https://github.com/zed-industries/zed/issues/11874)). --- .../gpui/src/platform/linux/wayland/client.rs | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/crates/gpui/src/platform/linux/wayland/client.rs b/crates/gpui/src/platform/linux/wayland/client.rs index 14a71b2340..aa2fb1eebd 100644 --- a/crates/gpui/src/platform/linux/wayland/client.rs +++ b/crates/gpui/src/platform/linux/wayland/client.rs @@ -23,7 +23,7 @@ use wayland_client::event_created_child; use wayland_client::globals::{registry_queue_init, GlobalList, GlobalListContents}; use wayland_client::protocol::wl_callback::{self, WlCallback}; use wayland_client::protocol::wl_data_device_manager::DndAction; -use wayland_client::protocol::wl_pointer::{AxisRelativeDirection, AxisSource}; +use wayland_client::protocol::wl_pointer::AxisSource; use wayland_client::protocol::wl_seat::WlSeat; use wayland_client::protocol::{ wl_data_device, wl_data_device_manager, wl_data_offer, wl_data_source, wl_output, wl_region, @@ -1334,24 +1334,6 @@ impl Dispatch for WaylandClientStatePtr { _ => unreachable!(), } } - wl_pointer::Event::AxisRelativeDirection { - axis: WEnum::Value(axis), - direction: WEnum::Value(direction), - } => match (axis, direction) { - (wl_pointer::Axis::VerticalScroll, AxisRelativeDirection::Identical) => { - state.vertical_modifier = -1.0 - } - (wl_pointer::Axis::VerticalScroll, AxisRelativeDirection::Inverted) => { - state.vertical_modifier = 1.0 - } - (wl_pointer::Axis::HorizontalScroll, AxisRelativeDirection::Identical) => { - state.horizontal_modifier = -1.0 - } - (wl_pointer::Axis::HorizontalScroll, AxisRelativeDirection::Inverted) => { - state.horizontal_modifier = 1.0 - } - _ => unreachable!(), - }, wl_pointer::Event::AxisValue120 { axis: WEnum::Value(axis), value120,