andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-23 02:05:33 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

input: Fix discrete axis value on winit

Browse Source
This commit is contained in:
Ivan Molodetskikh
2024-03-22 09:41:10 +04:00
parent fbe021fbdf
commit 977f1487c2
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/input.rs
+9 -6
View File
@@ -1078,15 +1078,18 @@ impl State {
fn on_pointer_axis<I: InputBackend>(&mut self, event: I::PointerAxisEvent) { fn on_pointer_axis<I: InputBackend>(&mut self, event: I::PointerAxisEvent) {
let source = event.source(); let source = event.source();
let horizontal_amount = event
.amount(Axis::Horizontal)
.unwrap_or_else(|| event.amount_v120(Axis::Horizontal).unwrap_or(0.0) * 3.0 / 120.);
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_v120 = event.amount_v120(Axis::Horizontal); let horizontal_amount_v120 = event.amount_v120(Axis::Horizontal);
let vertical_amount_v120 = event.amount_v120(Axis::Vertical); let vertical_amount_v120 = event.amount_v120(Axis::Vertical);
let horizontal_amount = event.amount(Axis::Horizontal).unwrap_or_else(|| {
// Winit backend, discrete scrolling.
horizontal_amount_v120.unwrap_or(0.0) / 120. * 15.
});
let vertical_amount = event.amount(Axis::Vertical).unwrap_or_else(|| {
// Winit backend, discrete scrolling.
vertical_amount_v120.unwrap_or(0.0) / 120. * 15.
});
let mut frame = AxisFrame::new(event.time_msec()).source(source); let mut frame = AxisFrame::new(event.time_msec()).source(source);
if horizontal_amount != 0.0 { if horizontal_amount != 0.0 {
frame = frame frame = frame