fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-19 19:08:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support input from drawing tablets on web (#4445)

Browse Source 
* Rename the editor mouse state types to Pointer* and the input_ modules

* Add optional pen attributes to the editor pointer state types

* Desktop: Send tablet pointer clicks to CEF as mouse clicks

* Desktop: End pointer lock and pending window drags on any left-equivalent release

* Desktop: Route pointer input carrying pen attributes directly to the editor

* Desktop: Route wheel and pinch input inside the viewport directly to the editor

* Desktop: Track double clicks on the direct editor route

* Desktop: Move the pointer lock position into InputState

* Restore the input state pointer position when pointer lock ends (review)

* Fix pen input being swallowed by Windows resize helper

* Update winit to 0.31.0-beta.2 from crates.io

* Add event time to the editor pointer states

The brush trace's hot core is position plus per-sample time, and the
frame clock is too coarse for high-rate tablets: several samples share
one timestamp and speed dynamics see dt = 0. The desktop stamps
editor-routed pointer input with a monotonic arrival time since winit
does not surface hardware timestamps; the web path can thread the
PointerEvent timeStamp through later.

* Capture pen input via browser api

* Replay coalesced pointer samples for smoother pen strokes

* Handle missing or empty coalesced pen events
This commit is contained in:
Timon
2026-08-27 15:18:59 +00:00
committed by GitHub
parent 5a16e18b2a
commit 681b38d3d6
2 changed files with 87 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
frontend/wrapper/src/editor_commands.rs
View File

@@ -299,8 +299,31 @@ mod editor_commands {
}
/// Mouse movement within the screenspace bounds of the viewport
fn on_mouse_move(x: f64, y: f64, mouse_keys: u8, modifiers: u8) -> Message {
let editor_mouse_state = EditorPointerState::from_keys_and_editor_position(mouse_keys, (x, y).into());
fn on_mouse_move(
x: f64,
y: f64,
mouse_keys: u8,
modifiers: u8,
time: Option<f64>,
pressure: Option<f64>,
tilt_x: Option<f64>,
tilt_y: Option<f64>,
twist: Option<f64>,
tangential: Option<f64>,
eraser: bool,
) -> Message {
let editor_mouse_state = EditorPointerState {
time,
pressure,
tilt: match (tilt_x, tilt_y) {
(Some(tilt_x), Some(tilt_y)) => Some((tilt_x, tilt_y).into()),
_ => None,
},
twist,
wheel: tangential,
eraser,
..EditorPointerState::from_keys_and_editor_position(mouse_keys, (x, y).into())
};
let modifier_keys = ModifierKeys::from_bits(modifiers).expect("Invalid modifier keys");
InputPreprocessorMessage::PointerMove { editor_mouse_state, modifier_keys }.into()
}
@@ -314,15 +337,61 @@ mod editor_commands {
}
/// A mouse button depressed within screenspace the bounds of the viewport
fn on_mouse_down(x: f64, y: f64, mouse_keys: u8, modifiers: u8) -> Message {
let editor_mouse_state = EditorPointerState::from_keys_and_editor_position(mouse_keys, (x, y).into());
fn on_mouse_down(
x: f64,
y: f64,
mouse_keys: u8,
modifiers: u8,
time: Option<f64>,
pressure: Option<f64>,
tilt_x: Option<f64>,
tilt_y: Option<f64>,
twist: Option<f64>,
tangential: Option<f64>,
eraser: bool,
) -> Message {
let editor_mouse_state = EditorPointerState {
time,
pressure,
tilt: match (tilt_x, tilt_y) {
(Some(tilt_x), Some(tilt_y)) => Some((tilt_x, tilt_y).into()),
_ => None,
},
twist,
wheel: tangential,
eraser,
..EditorPointerState::from_keys_and_editor_position(mouse_keys, (x, y).into())
};
let modifier_keys = ModifierKeys::from_bits(modifiers).expect("Invalid modifier keys");
InputPreprocessorMessage::PointerDown { editor_mouse_state, modifier_keys }.into()
}
/// A mouse button released
fn on_mouse_up(x: f64, y: f64, mouse_keys: u8, modifiers: u8) -> Message {
let editor_mouse_state = EditorPointerState::from_keys_and_editor_position(mouse_keys, (x, y).into());
fn on_mouse_up(
x: f64,
y: f64,
mouse_keys: u8,
modifiers: u8,
time: Option<f64>,
pressure: Option<f64>,
tilt_x: Option<f64>,
tilt_y: Option<f64>,
twist: Option<f64>,
tangential: Option<f64>,
eraser: bool,
) -> Message {
let editor_mouse_state = EditorPointerState {
time,
pressure,
tilt: match (tilt_x, tilt_y) {
(Some(tilt_x), Some(tilt_y)) => Some((tilt_x, tilt_y).into()),
_ => None,
},
twist,
wheel: tangential,
eraser,
..EditorPointerState::from_keys_and_editor_position(mouse_keys, (x, y).into())
};
let modifier_keys = ModifierKeys::from_bits(modifiers).expect("Invalid modifier keys");
InputPreprocessorMessage::PointerUp { editor_mouse_state, modifier_keys }.into()
}