Fix: sketch edit exit (double-click a sketch no longer traps you)

Edit Sketch rolls the timeline back to just after the sketch and faces it;
Finish Sketch, Esc (once nothing else is left to cancel) and editing another
feature all leave it, restoring the marker and the previous view. Editing the
open sketch again is a no-op and editing another sketch switches cleanly.
The control channel's ui.click takes double: true.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AS5Tn3xieewUSg3uxrMVdL
This commit is contained in:
bherbruckandClaude Opus 5.5 committed 2026-10-07 22:25:45 +00:00
1 parent 73f68f3f50
commit 71a1903122
6 files changed
+138 -12

No files matched your search

+56 -7
View File
@@ -18,6 +18,8 @@ pub mod palette;
pub mod preview;
pub mod selection;
pub mod sketch_dims;
#[cfg(test)]
mod sketch_edit_tests;
pub mod theme;
pub mod timeline;
pub mod toolbar;
@@ -85,6 +87,9 @@ pub struct SolveApp {
pub now: f64,
/// The view before the current sketch started (Finish Sketch returns to it).
pub pre_sketch_cam: Option<Camera>,
/// The history marker before Edit Sketch rolled the timeline to the sketch; Finish Sketch
/// restores it.
pub pre_sketch_marker: Option<Option<usize>>,
pub services: Services,
pub viewport: viewport::ViewportState,
pub tool: Option<tools::Tool>,
@@ -112,6 +117,7 @@ impl SolveApp {
cam_anim: None,
now: 0.0,
pre_sketch_cam: None,
pre_sketch_marker: None,
services,
viewport: viewport::ViewportState::default(),
tool: None,
@@ -178,12 +184,7 @@ impl SolveApp {
return;
}
if id == "SketchStop" {
let r = self.run(id, json!({}));
if r.is_ok()
&& let Some(c) = self.pre_sketch_cam.take()
{
self.animate_to(c);
}
self.finish_sketch();
return;
}
// Press Pull: edges get a fillet, faces and profiles an extrude.
@@ -226,9 +227,12 @@ impl SolveApp {
use solvecraft_engine::doc::FeatureKind;
let Some(f) = self.session.doc.feature(id) else { return };
if matches!(f.kind, FeatureKind::Sketch { .. }) {
let _ = self.run("SketchActivate", json!({ "sketch": id }));
self.edit_sketch(id);
return;
}
if self.session.active_sketch.is_some() {
self.finish_sketch();
}
let Some(idx) = self.session.doc.feature_index(id) else { return };
let marker = self.session.doc.marker;
self.tool = None;
@@ -245,6 +249,51 @@ impl SolveApp {
}
}
/// Edit a sketch the way Fusion does: roll the timeline back to just after it (so later
/// features don't hide it), turn the camera to face it, and remember both so Finish Sketch
/// puts them back. Editing the sketch that is already open does nothing; editing another one
/// finishes the current sketch first, so edit sessions never nest.
pub fn edit_sketch(&mut self, id: u64) {
if self.session.active_sketch == Some(id) {
return;
}
if self.session.active_sketch.is_some() {
self.finish_sketch();
}
self.tool = None;
self.dialog = None;
let Some(idx) = self.session.doc.feature_index(id) else { return };
let marker = self.session.doc.marker;
let rolled = marker.is_none_or(|m| m > idx + 1) && self.run("timeline.rollTo", json!({ "position": idx + 1 })).is_ok();
let before = self.cam;
if self.run("SketchActivate", json!({ "sketch": id })).is_err() {
if rolled {
self.restore_marker(marker);
}
return;
}
self.pre_sketch_marker = rolled.then_some(marker);
self.pre_sketch_cam = Some(before);
dialogs::look_at_sketch(self);
}
/// Finish the active sketch: stop editing, restore the history marker Edit Sketch moved and
/// return to the view from before the sketch.
pub fn finish_sketch(&mut self) {
self.tool = None;
let _ = self.run("SketchStop", json!({}));
if let Some(marker) = self.pre_sketch_marker.take() {
self.restore_marker(marker);
}
if let Some(c) = self.pre_sketch_cam.take() {
self.animate_to(c);
}
}
fn restore_marker(&mut self, marker: Option<usize>) {
let _ = self.run("timeline.rollTo", marker.map(|m| json!({ "position": m })).unwrap_or_else(|| json!({})));
}
/// Everything shown as selected: the selection plus the open dialog's inputs.
pub fn highlighted(&self) -> Vec<solvecraft_engine::Sel> {
let mut v = self.session.selection.clone();