forked from 1b-agent/opencadstudio-upstream
feat(input): touch screen gestures on the drawing
One finger already worked as the mouse. Two or more fingers now make a gesture instead of fighting over the cursor: two drag to pan and pinch to zoom about the fingers, three drag to orbit; a quick two-finger tap opens the context menu, a three-finger tap zooms to the extents and a quick three-finger swipe up shows the isometric view. While a gesture runs the drawing area's own pointer handling keeps out, and the press the first finger started is dropped. Refs #906 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
fcf1cedf52
commit
780b54489e
6 files changed
+339
No files matched your search
@@ -638,6 +638,10 @@ pub(super) struct OpenCADStudio {
|
||||
zoom_wheel_reversed: bool,
|
||||
/// Scroll pans and Ctrl+scroll zooms (touchpads); see `scroll_intent`.
|
||||
touchpad_pan: bool,
|
||||
/// Multi-finger gestures on a touch screen.
|
||||
touch: crate::input::touch::TouchGestures,
|
||||
/// Where the drawing area sits in the window, learned from a lone finger.
|
||||
touch_offset: Option<iced::Vector>,
|
||||
/// Interface scale in percent, applied through the window scale factor.
|
||||
ui_scale_percent: u16,
|
||||
/// Mouse-wheel zoom sensitivity (ZOOMFACTOR), held inside
|
||||
@@ -2347,6 +2351,8 @@ pub enum Message {
|
||||
SpaceMousePreferences,
|
||||
SpaceMouseDriverSettings,
|
||||
SpaceMouseDetails,
|
||||
/// A touch screen finger event, for multi-finger gestures.
|
||||
Touch(iced::touch::Event),
|
||||
/// One magnification delta from a trackpad pinch, positive zooming in.
|
||||
TrackpadPinch(f32),
|
||||
ControlRequest(control::Envelope),
|
||||
@@ -4571,6 +4577,8 @@ impl OpenCADStudio {
|
||||
polar_increment_deg: 45.0,
|
||||
zoom_wheel_reversed: false,
|
||||
touchpad_pan: false,
|
||||
touch: Default::default(),
|
||||
touch_offset: None,
|
||||
ui_scale_percent: 100,
|
||||
zoom_factor: 60,
|
||||
zoom_factor_input: 60.to_string(),
|
||||
|
||||
@@ -605,6 +605,7 @@ impl OpenCADStudio {
|
||||
match msg {
|
||||
Message::SpaceMouseWake => self.on_spacemouse_wake(),
|
||||
Message::TrackpadPinch(magnification) => self.on_pinch_zoom(magnification),
|
||||
Message::Touch(event) => self.on_touch(event),
|
||||
Message::SpaceMouseFrame(time) => {
|
||||
self.spacemouse
|
||||
.frame(time.saturating_duration_since(self.start).as_secs_f64() * 1000.);
|
||||
@@ -4343,6 +4344,18 @@ impl OpenCADStudio {
|
||||
// ── Cursor / viewport messages ─────────────────────────────────
|
||||
Message::CursorMoved(p, viewport) => self.on_cursor_moved(p, viewport),
|
||||
|
||||
// A multi-finger gesture owns the pointer while it runs.
|
||||
Message::ViewportMove(_)
|
||||
| Message::ViewportLeftPress
|
||||
| Message::ViewportLeftRelease
|
||||
| Message::PaneMove(..)
|
||||
| Message::PanePress(_)
|
||||
| Message::PaneRelease(_)
|
||||
if self.touch.active() =>
|
||||
{
|
||||
Task::none()
|
||||
}
|
||||
|
||||
Message::ViewportMove(p) => self.on_viewport_move(p),
|
||||
|
||||
Message::ViewportExit => self.on_viewport_exit(),
|
||||
|
||||
@@ -5943,6 +5943,80 @@ properties={:.1}ms picked={}",
|
||||
/// Pinch the active view to zoom, as reported by the trackpad monitor
|
||||
/// (`src/input/trackpad.rs`). The pivot is the cursor, like the wheel, and
|
||||
/// the direction is the fingers' own, so ZOOMWHEEL does not apply to it.
|
||||
/// A touch screen finger event: multi-finger gestures pan, zoom and
|
||||
/// orbit the view (see `input::touch`).
|
||||
pub(super) fn on_touch(&mut self, event: iced::touch::Event) -> Task<Message> {
|
||||
use crate::input::touch::TouchAction;
|
||||
let i = self.active_tab;
|
||||
if self.tabs[i].is_start {
|
||||
return Task::none();
|
||||
}
|
||||
// A lone finger drives the cursor, so where it is in the window and
|
||||
// in the drawing area tells the drawing area's offset.
|
||||
if let iced::touch::Event::FingerMoved { position, .. } = event {
|
||||
let cursor = self.tabs[i].scene.selection.borrow().input.last_move_pos;
|
||||
if let Some(cursor) = cursor.filter(|_| self.touch.fingers() == 1) {
|
||||
self.touch_offset = Some(position - cursor);
|
||||
}
|
||||
}
|
||||
let mut tasks = Vec::new();
|
||||
for action in self.touch.event(event) {
|
||||
match action {
|
||||
TouchAction::Cancel => {
|
||||
self.tabs[i]
|
||||
.scene
|
||||
.selection
|
||||
.borrow_mut()
|
||||
.clear_left_selection_gesture();
|
||||
self.drag_move = None;
|
||||
self.tabs[i].scene.remember_current_view();
|
||||
self.clear_navigation_hover(i);
|
||||
}
|
||||
TouchAction::Pan(delta) => {
|
||||
self.pan_active_view(i, delta.x, delta.y, Instant::now());
|
||||
}
|
||||
TouchAction::Zoom { factor, centre } => {
|
||||
// Zoom about the fingers once the drawing area's place in
|
||||
// the window is known; until then about the first finger.
|
||||
if let Some(offset) = self.touch_offset {
|
||||
self.tabs[i].scene.selection.borrow_mut().input.last_move_pos =
|
||||
Some(centre - offset);
|
||||
}
|
||||
tasks.push(self.zoom_view_at_cursor(pinch_zoom_steps(factor - 1.0)));
|
||||
}
|
||||
TouchAction::Orbit(delta) => {
|
||||
if self.tabs[i].scene.active_viewport.is_some() {
|
||||
self.tabs[i].scene.orbit_active_viewport(delta.x, delta.y);
|
||||
} else if self.tabs[i].scene.current_layout == "Model" {
|
||||
let scene = &self.tabs[i].scene;
|
||||
let (vw, vh) = scene.selection.borrow().view.vp_size;
|
||||
let bounds = scene.active_model_tile_bounds(vw, vh);
|
||||
let pivot = scene
|
||||
.orbit_pivot()
|
||||
.or_else(|| scene.view_center_surface_pivot(bounds))
|
||||
.unwrap_or_else(|| scene.camera.borrow().target);
|
||||
self.tabs[i].scene.refresh_projection_bounds();
|
||||
self.tabs[i]
|
||||
.scene
|
||||
.camera
|
||||
.borrow_mut()
|
||||
.orbit(delta.x, delta.y, Some(pivot));
|
||||
}
|
||||
self.tabs[i].scene.camera_generation += 1;
|
||||
}
|
||||
TouchAction::Tap(2) => {
|
||||
tasks.push(self.update(Message::ViewportRightPress));
|
||||
tasks.push(self.update(Message::ViewportRightRelease));
|
||||
}
|
||||
TouchAction::Tap(_) => {
|
||||
tasks.push(Task::done(Message::Command("ZOOM E".to_string())));
|
||||
}
|
||||
TouchAction::SwipeUp => tasks.push(self.apply_view_preset("SEISO")),
|
||||
}
|
||||
}
|
||||
Task::batch(tasks)
|
||||
}
|
||||
|
||||
pub(super) fn on_pinch_zoom(&mut self, magnification: f32) -> Task<Message> {
|
||||
if magnification == 0.0 {
|
||||
return Task::none();
|
||||
|
||||
@@ -2717,6 +2717,7 @@ impl OpenCADStudio {
|
||||
.map(|_| Message::SpaceMouseWake),
|
||||
crate::input::trackpad::subscription().map(Message::TrackpadPinch),
|
||||
event::listen_with(|event, _, id| match event {
|
||||
iced::Event::Touch(touch) => Some(Message::Touch(touch)),
|
||||
iced::Event::Window(window::Event::Focused) => {
|
||||
Some(Message::SpaceMouseFocus(id, true))
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user