migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-06-26 22:53:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix touch location accuracy (#2944)

Browse Source
This commit is contained in:
daxpedda
2023-07-10 02:17:36 +02:00
committed by GitHub
parent 5e0e1e96bc
commit 42e492cde8
3 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/platform_impl/web/web_sys/pointer.rs
View File

@@ -80,7 +80,6 @@ impl PointerHandler {
T: 'static + FnMut(ModifiersState, i32, PhysicalPosition<f64>, Force),
{
let window = canvas_common.window.clone();
let canvas = canvas_common.raw.clone();
self.on_pointer_release = Some(canvas_common.add_user_event(
"pointerup",
move |event: PointerEvent| {
@@ -90,8 +89,7 @@ impl PointerHandler {
"touch" => touch_handler(
modifiers,
event.pointer_id(),
event::touch_position(&event, &canvas)
.to_physical(super::scale_factor(&window)),
event::mouse_position(&event).to_physical(super::scale_factor(&window)),
Force::Normalized(event.pressure() as f64),
),
"mouse" => mouse_handler(
@@ -137,8 +135,7 @@ impl PointerHandler {
touch_handler(
modifiers,
event.pointer_id(),
event::touch_position(&event, &canvas)
.to_physical(super::scale_factor(&window)),
event::mouse_position(&event).to_physical(super::scale_factor(&window)),
Force::Normalized(event.pressure() as f64),
);
}
@@ -247,7 +244,7 @@ impl PointerHandler {
id,
&mut event::pointer_move_event(event).map(|event| {
(
event::touch_position(&event, &canvas).to_physical(scale),
event::mouse_position(&event).to_physical(scale),
Force::Normalized(event.pressure() as f64),
)
}),
@@ -263,15 +260,13 @@ impl PointerHandler {
F: 'static + FnMut(i32, PhysicalPosition<f64>, Force),
{
let window = canvas_common.window.clone();
let canvas = canvas_common.raw.clone();
self.on_touch_cancel = Some(canvas_common.add_event(
"pointercancel",
move |event: PointerEvent| {
if event.pointer_type() == "touch" {
handler(
event.pointer_id(),
event::touch_position(&event, &canvas)
.to_physical(super::scale_factor(&window)),
event::mouse_position(&event).to_physical(super::scale_factor(&window)),
Force::Normalized(event.pressure() as f64),
);
}