diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2024-01-05 17:05:35 +0400 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2024-01-05 23:23:30 +0400 |
| commit | 655b9808b95e6d8dd1c24a34061127741c485f04 (patch) | |
| tree | e9925b83ec207172d13c3334c6a1fa930c1df4ad | |
| parent | 5cd31e5730160f9162502d2388dc00400c7a87ae (diff) | |
| download | niri-655b9808b95e6d8dd1c24a34061127741c485f04.tar.gz niri-655b9808b95e6d8dd1c24a34061127741c485f04.tar.bz2 niri-655b9808b95e6d8dd1c24a34061127741c485f04.zip | |
Update Smithay
| -rw-r--r-- | Cargo.lock | 20 | ||||
| -rw-r--r-- | src/input.rs | 4 |
2 files changed, 9 insertions, 15 deletions
@@ -1809,7 +1809,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" dependencies = [ - "proc-macro-crate 2.0.1", + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.41", @@ -2050,16 +2050,6 @@ dependencies = [ ] [[package]] -name = "proc-macro-crate" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" -dependencies = [ - "toml_datetime", - "toml_edit 0.20.2", -] - -[[package]] name = "proc-macro-error" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2462,7 +2452,7 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "smithay" version = "0.3.0" -source = "git+https://github.com/Smithay/smithay.git#b15d29e596b629ec25474b67cc9ecb2f1729d6a2" +source = "git+https://github.com/Smithay/smithay.git#ee0219884aa285230c6ffe2f3818c4d253c5bab5" dependencies = [ "appendlist", "bitflags 2.4.1", @@ -2533,7 +2523,7 @@ dependencies = [ [[package]] name = "smithay-drm-extras" version = "0.1.0" -source = "git+https://github.com/Smithay/smithay.git#b15d29e596b629ec25474b67cc9ecb2f1729d6a2" +source = "git+https://github.com/Smithay/smithay.git#ee0219884aa285230c6ffe2f3818c4d253c5bab5" dependencies = [ "drm", "edid-rs", @@ -3662,7 +3652,7 @@ version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", "regex", @@ -3721,7 +3711,7 @@ version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", "syn 1.0.109", diff --git a/src/input.rs b/src/input.rs index 7b58ad1e..330f38fc 100644 --- a/src/input.rs +++ b/src/input.rs @@ -817,12 +817,16 @@ impl State { let mut frame = AxisFrame::new(event.time_msec()).source(source); if horizontal_amount != 0.0 { + frame = frame + .relative_direction(Axis::Horizontal, event.relative_direction(Axis::Horizontal)); frame = frame.value(Axis::Horizontal, horizontal_amount); if let Some(discrete) = horizontal_amount_discrete { frame = frame.v120(Axis::Horizontal, discrete as i32); } } if vertical_amount != 0.0 { + frame = + frame.relative_direction(Axis::Vertical, event.relative_direction(Axis::Vertical)); frame = frame.value(Axis::Vertical, vertical_amount); if let Some(discrete) = vertical_amount_discrete { frame = frame.v120(Axis::Vertical, discrete as i32); |