From fb7d601feacf99f55e7841e857b539b95d6f261e Mon Sep 17 00:00:00 2001 From: HassanKhan Date: Thu, 19 Nov 2026 19:42:22 +0500 Subject: [PATCH] View: no guide from the rulers while Trim View is on (#8363) Trim View hides the guides, so a guide dragged or double-clicked out of a ruler while it is on was made but could not be seen, and the drag turned the stored Show Guides choice on. Now neither makes a guide: no preview line, no undo step, the stored choice is left alone, and the status line says why. A drag already going when Trim View turns on ends as a release off the canvas does. --- crates/engine/src/tooling.rs | 6 +++ crates/ui-egui/src/canvas/grid.rs | 22 ++++++++- crates/ui-egui/src/canvas/tests.rs | 77 ++++++++++++++++++++++++++++++ crates/ui-egui/src/menus.rs | 1 + crates/ui-egui/src/menus/run.rs | 2 +- docs/roadmap.md | 2 +- docs/target-app-parity.md | 4 +- docs/ui-parity.md | 4 +- 8 files changed, 110 insertions(+), 8 deletions(-) diff --git a/crates/engine/src/tooling.rs b/crates/engine/src/tooling.rs index 5f36c5a98e..cef810afa5 100644 --- a/crates/engine/src/tooling.rs +++ b/crates/engine/src/tooling.rs @@ -839,6 +839,12 @@ impl Session { self.ruler_origin = None; } + /// A guide is being dragged out of a ruler ([`Session::ruler_guide`]): its first event came + /// and its release has not. + pub fn ruler_guide_dragging(&self) -> bool { + self.ruler_guide.is_some() + } + /// Time passed while the pointer button is held (`dt` seconds; see [`Tool::tick`]): the /// desktop app ticks every frame of a press, agents with `holdMs` on a pointer event. pub fn tool_tick(&mut self, dt: f64, view: ViewInfo) -> Result> { diff --git a/crates/ui-egui/src/canvas/grid.rs b/crates/ui-egui/src/canvas/grid.rs index 5d533f7eaf..422e91811c 100644 --- a/crates/ui-egui/src/canvas/grid.rs +++ b/crates/ui-egui/src/canvas/grid.rs @@ -222,7 +222,14 @@ pub(super) fn ruler_input(app: &mut VectorcraftApp, ui: &Ui, full: egui::Rect, c if resp.clicked_by(egui::PointerButton::Primary) { ui.data_mut(|d| d.insert_temp(last_click, now)); } - if resp.double_clicked_by(egui::PointerButton::Primary) + // Trim View hides the guides (#8363): a guide made now could not be seen, so none is. + let trim_view = app.ui.view.trim_view; + let refuse = |app: &mut VectorcraftApp| app.status(crate::menus::TRIM_VIEW_HIDES.to_string()); + if trim_view && first_here && resp.double_clicked_by(egui::PointerButton::Primary) { + refuse(app); + } + if !trim_view + && resp.double_clicked_by(egui::PointerButton::Primary) && first_here && let Some(p) = resp.interact_pointer_pos().or_else(|| ui.input(|i| i.pointer.latest_pos())) { @@ -253,8 +260,19 @@ pub(super) fn ruler_input(app: &mut VectorcraftApp, ui: &Ui, full: egui::Rect, c } else { continue; }; + if trim_view { + if resp.drag_started() { + refuse(app); + } + // No guide is dragged out, so none previews. One already dragged when Trim View + // turned on ends as a release off the canvas does: no guide, no undo step. + if !app.session.ruler_guide_dragging() { + continue; + } + } + let kind = if trim_view { PointerKind::Up } else { kind }; let p = resp.interact_pointer_pos().or_else(|| ui.input(|i| i.pointer.latest_pos())); - let on_canvas = p.is_some_and(|p| canvas.contains(p)); + let on_canvas = !trim_view && p.is_some_and(|p| canvas.contains(p)); if on_canvas { // The new guide shows even if guides were hidden. app.ui.view.guides = true; diff --git a/crates/ui-egui/src/canvas/tests.rs b/crates/ui-egui/src/canvas/tests.rs index fde4bf777f..3a39185a11 100644 --- a/crates/ui-egui/src/canvas/tests.rs +++ b/crates/ui-egui/src/canvas/tests.rs @@ -15344,3 +15344,80 @@ fn trim_view_deselects_selected_guide_paths() { assert!(app.session.active().unwrap().selection.objects.is_empty()); } + +/// #8363: Trim View hides the guides, so a guide dragged or double-clicked out of a ruler while it +/// is on would be made but never seen. None is: no preview line, no guide, no undo step, the +/// stored Show/Hide Guides choice is left alone, and the status line says why. A drag already +/// going when Trim View turns on ends as a release off the canvas does. +#[test] +fn trim_view_makes_no_guide_from_the_rulers() { + let mut app = VectorcraftApp::new(Session::new(), Default::default()); + app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap(); + app.ui.view.rulers = true; + app.ui.view.guides = false; + app.ui.view.smart_guides = false; + app.ui.view.snap_to_point = false; + app.ui.view.trim_view = true; + let ctx = egui::Context::default(); + frame(&mut app, &ctx, vec![]); + let rect = app.canvas_rect.unwrap(); + let from = pos2(rect.center().x, rect.top() - RULER / 2.0); + let at = pos2(rect.center().x, rect.top() + 120.0); + let button = |pos, pressed| egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() }; + let across = |s: &Shape| { + matches!(s, Shape::LineSegment { points, .. } + if (points[0].y - at.y).abs() <= 2.0 && points[0].y == points[1].y && (points[1].x - points[0].x).abs() >= rect.width() - 0.5) + }; + let count = |app: &VectorcraftApp| app.session.active().unwrap().doc.ruler_guides().len(); + let steps = |app: &VectorcraftApp| app.session.active().unwrap().history.undo.len(); + let before = steps(&app); + + // A drag: nothing previews and nothing is made. + frame(&mut app, &ctx, vec![egui::Event::PointerMoved(from)]); + frame(&mut app, &ctx, vec![button(from, true)]); + frame(&mut app, &ctx, vec![egui::Event::PointerMoved(at)]); + assert!(!shapes(&mut app, &ctx).iter().any(across), "no guide previews"); + assert!(!app.session.ruler_guide_dragging()); + frame(&mut app, &ctx, vec![button(at, false)]); + assert_eq!(count(&app), 0, "no guide from a drag"); + assert!(!app.ui.view.guides, "the stored choice is left alone"); + assert_eq!(app.ui.status, crate::menus::TRIM_VIEW_HIDES); + + // A double-click: nothing either. + app.ui.status.clear(); + let click = |app: &mut VectorcraftApp| { + frame(app, &ctx, vec![egui::Event::PointerMoved(from)]); + frame(app, &ctx, vec![button(from, true)]); + frame(app, &ctx, vec![button(from, false)]); + }; + click(&mut app); + click(&mut app); + assert_eq!(count(&app), 0, "no guide from a double-click"); + assert!(!app.ui.view.guides); + assert_eq!(app.ui.status, crate::menus::TRIM_VIEW_HIDES); + assert_eq!(steps(&app), before, "no undo step"); + + // Trim View turned on during a drag: the drag ends without a guide. + app.ui.view.trim_view = false; + let from2 = pos2(rect.center().x + 30.0, rect.top() - RULER / 2.0); + frame(&mut app, &ctx, vec![egui::Event::PointerMoved(from2)]); + frame(&mut app, &ctx, vec![button(from2, true)]); + frame(&mut app, &ctx, vec![egui::Event::PointerMoved(at)]); + assert!(app.session.ruler_guide_dragging(), "the drag started with Trim View off"); + app.ui.view.trim_view = true; + frame(&mut app, &ctx, vec![egui::Event::PointerMoved(pos2(at.x + 5.0, at.y))]); + assert!(!app.session.ruler_guide_dragging(), "ended"); + assert!(!shapes(&mut app, &ctx).iter().any(across), "no guide previews"); + frame(&mut app, &ctx, vec![button(at, false)]); + assert_eq!(count(&app), 0, "no guide from the drag Trim View interrupted"); + assert_eq!(steps(&app), before, "no undo step"); + + // With Trim View off again, a drag makes a guide as before. + app.ui.view.trim_view = false; + frame(&mut app, &ctx, vec![egui::Event::PointerMoved(from)]); + frame(&mut app, &ctx, vec![button(from, true)]); + frame(&mut app, &ctx, vec![egui::Event::PointerMoved(at)]); + frame(&mut app, &ctx, vec![button(at, false)]); + assert_eq!(count(&app), 1); + assert!(app.ui.view.guides, "the new guide shows"); +} diff --git a/crates/ui-egui/src/menus.rs b/crates/ui-egui/src/menus.rs index 781b6a9f63..92617f90ca 100644 --- a/crates/ui-egui/src/menus.rs +++ b/crates/ui-egui/src/menus.rs @@ -49,6 +49,7 @@ mod invoke; mod keyboard; mod labels; mod run; +pub(crate) use run::TRIM_VIEW_HIDES; mod slots; mod state; mod submenus; diff --git a/crates/ui-egui/src/menus/run.rs b/crates/ui-egui/src/menus/run.rs index 4b5358b09d..71d384f5cf 100644 --- a/crates/ui-egui/src/menus/run.rs +++ b/crates/ui-egui/src/menus/run.rs @@ -136,7 +136,7 @@ pub fn run_ui_command(app: &mut VectorcraftApp, id: &str, p: &Value) -> Option