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

seat: uniformly convert scroll steps to scroll px

Browse source
This commit is contained in:
Julian Orth 2022-06-05 14:14:53 +02:00
parent 2a9c746781
commit b89d72fcd9
7 changed files with 23 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/ifs/wl_seat/pointer_owner.rs
View file

@ -1,6 +1,6 @@
use {
crate::{
backend::{AxisSource, KeyState, ScrollAxis},
backend::{AxisSource, KeyState, ScrollAxis, AXIS_120},
fixed::Fixed,
ifs::{
ipc,
@ -55,11 +55,17 @@ impl PointerOwnerHolder {
pub fn frame(&self, dev: &DeviceHandlerData, seat: &Rc<WlSeatGlobal>, time_usec: u64) {
self.pending_scroll.time_usec.set(time_usec);
let pending = self.pending_scroll.take();
for axis in 0..2 {
if let Some(dist) = pending.v120[axis].get() {
let px = (dist as f64 / AXIS_120 as f64) * dev.px_per_scroll_wheel.get();
pending.px[axis].set(Some(Fixed::from_f64(px)));
}
}
seat.state.for_each_seat_tester(|t| {
t.send_axis(seat.id, time_usec, dev, &pending);
t.send_axis(seat.id, time_usec, &pending);
});
if let Some(node) = self.owner.get().axis_node(seat) {
node.node_on_axis_event(dev, seat, &pending);
node.node_on_axis_event(seat, &pending);
}
}