diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2023-12-19 20:48:15 +0400 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2023-12-19 20:48:15 +0400 |
| commit | 206493bb354fd56140e8bf00592c6dd683a6a117 (patch) | |
| tree | ee2217c48d9868eb2347531649218af8eeb9636d /src/input.rs | |
| parent | c29a049245ffa0eb737114774da4c01c09897dfc (diff) | |
| download | niri-206493bb354fd56140e8bf00592c6dd683a6a117.tar.gz niri-206493bb354fd56140e8bf00592c6dd683a6a117.tar.bz2 niri-206493bb354fd56140e8bf00592c6dd683a6a117.zip | |
Update Smithay
Diffstat (limited to 'src/input.rs')
| -rw-r--r-- | src/input.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/input.rs b/src/input.rs index f84b8465..cb97800e 100644 --- a/src/input.rs +++ b/src/input.rs @@ -701,24 +701,24 @@ impl State { let horizontal_amount = event .amount(Axis::Horizontal) - .unwrap_or_else(|| event.amount_discrete(Axis::Horizontal).unwrap_or(0.0) * 3.0); + .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_discrete(Axis::Vertical).unwrap_or(0.0) * 3.0); - let horizontal_amount_discrete = event.amount_discrete(Axis::Horizontal); - let vertical_amount_discrete = event.amount_discrete(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(source); if horizontal_amount != 0.0 { frame = frame.value(Axis::Horizontal, horizontal_amount); if let Some(discrete) = horizontal_amount_discrete { - frame = frame.discrete(Axis::Horizontal, discrete as i32); + frame = frame.v120(Axis::Horizontal, discrete as i32); } } if vertical_amount != 0.0 { frame = frame.value(Axis::Vertical, vertical_amount); if let Some(discrete) = vertical_amount_discrete { - frame = frame.discrete(Axis::Vertical, discrete as i32); + frame = frame.v120(Axis::Vertical, discrete as i32); } } |