Jayden/wayvr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move mouse move-scroll exclusivity to hid module

Browse Source
This commit is contained in:
galister
2024-09-11 06:03:22 +09:00
parent b0a33a1181
commit 13d9284bb8
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/input.rs
View File

@@ -370,18 +370,13 @@ where
); );
} }
let scroll_threshold = 0.1;
let mut haptics: Option<Haptics> = None;
// Pass mouse motion events only if not scrolling // Pass mouse motion events only if not scrolling
// (allows scrolling on all Chromium-based applications) // (allows scrolling on all Chromium-based applications)
if app.input_state.pointers[idx].now.scroll.abs() <= scroll_threshold { let haptics = hovered.backend.on_hover(app, &hit);
haptics = hovered.backend.on_hover(app, &hit);
}
pointer = &mut app.input_state.pointers[idx]; pointer = &mut app.input_state.pointers[idx];
if pointer.now.scroll.abs() > scroll_threshold { if pointer.now.scroll.abs() > 0.1 {
let scroll = pointer.now.scroll; let scroll = pointer.now.scroll;
if app.input_state.pointers[1 - idx] if app.input_state.pointers[1 - idx]
.interaction .interaction

5
src/hid/mod.rs
View File

@@ -242,7 +242,7 @@ impl HidProvider for UInputProvider {
self.desktop_origin = origin; self.desktop_origin = origin;
} }
fn mouse_move(&mut self, pos: Vec2) { fn mouse_move(&mut self, pos: Vec2) {
if self.current_action.pos.is_none() { if self.current_action.pos.is_none() && self.current_action.scroll.is_none() {
self.current_action.pos = Some(pos); self.current_action.pos = Some(pos);
} }
self.current_action.last_requested_pos = Some(pos); self.current_action.last_requested_pos = Some(pos);
@@ -256,6 +256,9 @@ impl HidProvider for UInputProvider {
fn wheel(&mut self, delta: i32) { fn wheel(&mut self, delta: i32) {
if self.current_action.scroll.is_none() { if self.current_action.scroll.is_none() {
self.current_action.scroll = Some(delta); self.current_action.scroll = Some(delta);
// Pass mouse motion events only if not scrolling
// (allows scrolling on all Chromium-based applications)
self.current_action.pos = None;
} }
} }
fn commit(&mut self) { fn commit(&mut self) {