leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix generation of axis_stop events

Browse source 
`axis_stop` should only be sent if the value is `Some(0)`, while this
also sent it for `None`. So every scroll event on one axis generated
stop events for the other.

This fixes scrolling with a touchpad in Alacritty.

Anvil already does this, comparing against `Some(0.0)`.
This commit is contained in:
Ian Douglas Scott 2023-12-21 13:32:37 -08:00 • committed by Victoria Brekenfeld
parent ad3a917151
commit 144f8cbf69
1 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/input/mod.rs
View file

@ -2,7 +2,7 @@
use crate::{ use crate::{
backend::render::cursor::CursorState, backend::render::cursor::CursorState,
config::{xkb_config_to_wl, Action, Config, KeyPattern, KeyModifiers}, config::{xkb_config_to_wl, Action, Config, KeyModifiers, KeyPattern},
shell::{ shell::{
focus::{target::PointerFocusTarget, FocusDirection}, focus::{target::PointerFocusTarget, FocusDirection},
grabs::{ResizeEdge, SeatMenuGrabState, SeatMoveGrabState}, grabs::{ResizeEdge, SeatMenuGrabState, SeatMoveGrabState},
@ -1027,38 +1027,31 @@ impl State {
} }
} }
let horizontal_amount = event.amount(Axis::Horizontal).unwrap_or_else(|| { let mut frame = AxisFrame::new(event.time_msec()).source(event.source());
event.amount_v120(Axis::Horizontal).unwrap_or(0.0) * 3.0 / 120. if let Some(horizontal_amount) = event.amount(Axis::Horizontal) {
});
let vertical_amount = event.amount(Axis::Vertical).unwrap_or_else(|| {
event.amount_v120(Axis::Vertical).unwrap_or(0.0) * 3.0 / 120.
});
let horizontal_amount_discrete = event.amount_v120(Axis::Horizontal);
let vertical_amount_discrete = event.amount_v120(Axis::Vertical);
{
let mut frame = AxisFrame::new(event.time_msec()).source(event.source());
if horizontal_amount != 0.0 { if horizontal_amount != 0.0 {
frame = frame =
frame.value(Axis::Horizontal, scroll_factor * horizontal_amount); frame.value(Axis::Horizontal, scroll_factor * horizontal_amount);
if let Some(discrete) = horizontal_amount_discrete { if let Some(discrete) = event.amount_v120(Axis::Horizontal) {
frame = frame.v120(Axis::Horizontal, discrete as i32); frame = frame.v120(Axis::Horizontal, discrete as i32);
} }
} else if event.source() == AxisSource::Finger { } else if event.source() == AxisSource::Finger {
frame = frame.stop(Axis::Horizontal); frame = frame.stop(Axis::Horizontal);
} }
}
if let Some(vertical_amount) = event.amount(Axis::Vertical) {
if vertical_amount != 0.0 { if vertical_amount != 0.0 {
frame = frame.value(Axis::Vertical, scroll_factor * vertical_amount); frame = frame.value(Axis::Vertical, scroll_factor * vertical_amount);
if let Some(discrete) = vertical_amount_discrete { if let Some(discrete) = event.amount_v120(Axis::Vertical) {
frame = frame.v120(Axis::Vertical, discrete as i32); frame = frame.v120(Axis::Vertical, discrete as i32);
} }
} else if event.source() == AxisSource::Finger { } else if event.source() == AxisSource::Finger {
frame = frame.stop(Axis::Vertical); frame = frame.stop(Axis::Vertical);
} }
let ptr = seat.get_pointer().unwrap();
ptr.axis(self, frame);
ptr.frame(self);
} }
let ptr = seat.get_pointer().unwrap();
ptr.axis(self, frame);
ptr.frame(self);
} }
} }
InputEvent::GestureSwipeBegin { event, .. } => { InputEvent::GestureSwipeBegin { event, .. } => {