entailz/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

ei: Fix flipped scroll axes

Browse source
This commit is contained in:
Tadeo Kondrak 2025-03-14 13:21:58 -06:00 • committed by Julian Orth
parent ec862648c9
commit bb569dfa00
3 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/ei/ei_ifs/ei_scroll.rs
View file

@ -6,6 +6,7 @@ use {
ei_object::{EiObject, EiVersion},
},
fixed::Fixed,
ifs::wl_seat::wl_pointer::{HORIZONTAL_SCROLL, VERTICAL_SCROLL},
leaks::Tracker,
wire_ei::{
EiScrollId,
@ -65,8 +66,8 @@ impl EiScrollRequestHandler for EiScroll {
}
fn client_scroll(&self, req: ClientScroll, _slf: &Rc<Self>) -> Result<(), Self::Error> {
self.device.scroll_px[0].set(Some(req.x));
self.device.scroll_px[1].set(Some(req.y));
self.device.scroll_px[HORIZONTAL_SCROLL as usize].set(Some(req.x));
self.device.scroll_px[VERTICAL_SCROLL as usize].set(Some(req.y));
Ok(())
}
@ -75,8 +76,8 @@ impl EiScrollRequestHandler for EiScroll {
req: ClientScrollDiscrete,
_slf: &Rc<Self>,
) -> Result<(), Self::Error> {
self.device.scroll_v120[0].set(Some(req.x));
self.device.scroll_v120[1].set(Some(req.y));
self.device.scroll_v120[HORIZONTAL_SCROLL as usize].set(Some(req.x));
self.device.scroll_v120[VERTICAL_SCROLL as usize].set(Some(req.y));
Ok(())
}
@ -85,8 +86,8 @@ impl EiScrollRequestHandler for EiScroll {
req: ClientScrollStop,
_slf: &Rc<Self>,
) -> Result<(), Self::Error> {
self.device.scroll_stop[0].set(Some(req.x != 0));
self.device.scroll_stop[1].set(Some(req.y != 0));
self.device.scroll_stop[HORIZONTAL_SCROLL as usize].set(Some(req.x != 0));
self.device.scroll_stop[VERTICAL_SCROLL as usize].set(Some(req.y != 0));
Ok(())
}
}