Start page and document tabs
Start page (shown on launch without a file, and from the house button in the application bar): New Design, Open, recent designs (kept in the preferences, newest first) and built-in samples, each card with a picture rendered from the design in the background. Samples are scripts of engine commands: the sample plate plus a sheet metal bracket, a hinge assembly with a revolute joint, a plastic enclosure (lip, bosses, rest, snap fit), a bolted flange with a parametric circular pattern and a vent plate with a parametric rectangular pattern (test: all build without a failing feature). Several open designs as tabs in the application bar: each keeps its own session (undo, selection), camera and hidden/shown items; + and Ctrl+N open a new design, opening a file or a sample uses a new tab unless the current design is blank, closing a tab with unsaved changes asks Save / Don't Save / Cancel. Control channel: ui.documents and ui.home (docs/control-protocol.md). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AS5Tn3xieewUSg3uxrMVdL
This commit is contained in:
1 parent
c8da3b78f3
commit
bdc15d2204
9 files changed
+1003
-12
No files matched your search
@@ -0,0 +1,430 @@
|
||||
//! Several open designs, as tabs in the application bar. The active design lives in the app as
|
||||
//! always (`app.session`, `app.cam`…); the others wait here with their own session (undo,
|
||||
//! selection), camera and per-design view state, and are swapped in when their tab is picked.
|
||||
//! Closing a design with unsaved changes asks first.
|
||||
|
||||
use egui::{Align2, Color32, FontId, Rect, Sense, Stroke, pos2, vec2};
|
||||
use serde_json::{Value, json};
|
||||
use solvecraft_engine::Session;
|
||||
use solvecraft_engine::render::Camera;
|
||||
|
||||
use crate::SolveApp;
|
||||
use crate::theme::Tokens;
|
||||
|
||||
/// Most designs open at once.
|
||||
pub const MAX_OPEN: usize = 32;
|
||||
|
||||
/// A design that is not the active one: everything that belongs to it alone.
|
||||
pub struct DocSlot {
|
||||
session: Session,
|
||||
cam: Camera,
|
||||
pre_sketch_cam: Option<Camera>,
|
||||
pre_sketch_marker: Option<Option<usize>>,
|
||||
view: DocView,
|
||||
}
|
||||
|
||||
/// The per-design part of the UI state (what is hidden, shown or locked).
|
||||
#[derive(Clone, Debug, Default)]
|
||||
struct DocView {
|
||||
hidden_bodies: Vec<String>,
|
||||
hidden_origin: Vec<String>,
|
||||
hidden_sketches: Vec<u64>,
|
||||
shown_sketches: Vec<u64>,
|
||||
hidden_profiles: Vec<u64>,
|
||||
shown_dims: Vec<u64>,
|
||||
locked_bodies: Vec<String>,
|
||||
}
|
||||
|
||||
impl DocSlot {
|
||||
fn new(session: Session) -> DocSlot {
|
||||
DocSlot { session, cam: Camera::default(), pre_sketch_cam: None, pre_sketch_marker: None, view: DocView::default() }
|
||||
}
|
||||
}
|
||||
|
||||
/// The open designs: one slot per tab; the active tab's slot is empty (its design is in the app).
|
||||
#[derive(Default)]
|
||||
pub struct Documents {
|
||||
slots: Vec<Option<DocSlot>>,
|
||||
pub active: usize,
|
||||
/// A tab waiting for the answer to "save changes?".
|
||||
pub closing: Option<usize>,
|
||||
}
|
||||
|
||||
impl Documents {
|
||||
/// Number of open designs (at least the active one).
|
||||
pub fn count(&self) -> usize {
|
||||
self.slots.len().max(1)
|
||||
}
|
||||
}
|
||||
|
||||
fn take_view(app: &mut SolveApp) -> DocView {
|
||||
let u = &mut app.ui;
|
||||
DocView {
|
||||
hidden_bodies: std::mem::take(&mut u.hidden_bodies),
|
||||
hidden_origin: std::mem::take(&mut u.hidden_origin),
|
||||
hidden_sketches: std::mem::take(&mut u.hidden_sketches),
|
||||
shown_sketches: std::mem::take(&mut u.shown_sketches),
|
||||
hidden_profiles: std::mem::take(&mut u.hidden_profiles),
|
||||
shown_dims: std::mem::take(&mut u.shown_dims),
|
||||
locked_bodies: std::mem::take(&mut u.locked_bodies),
|
||||
}
|
||||
}
|
||||
|
||||
fn put_view(app: &mut SolveApp, v: DocView) {
|
||||
let u = &mut app.ui;
|
||||
u.hidden_bodies = v.hidden_bodies;
|
||||
u.hidden_origin = v.hidden_origin;
|
||||
u.hidden_sketches = v.hidden_sketches;
|
||||
u.shown_sketches = v.shown_sketches;
|
||||
u.hidden_profiles = v.hidden_profiles;
|
||||
u.shown_dims = v.shown_dims;
|
||||
u.locked_bodies = v.locked_bodies;
|
||||
}
|
||||
|
||||
/// Put `slot` into the app and return what was there.
|
||||
fn swap_in(app: &mut SolveApp, slot: DocSlot) -> DocSlot {
|
||||
// Whatever was going on in the design leaves with it.
|
||||
crate::dialogs::cancel(app);
|
||||
app.tool = None;
|
||||
app.params = None;
|
||||
app.cam_anim = None;
|
||||
app.preview = crate::preview::PreviewState::default();
|
||||
app.viewport.hover = None;
|
||||
let out_rev = app.session.revision;
|
||||
let out = DocSlot {
|
||||
session: std::mem::replace(&mut app.session, slot.session),
|
||||
cam: std::mem::replace(&mut app.cam, slot.cam),
|
||||
pre_sketch_cam: std::mem::replace(&mut app.pre_sketch_cam, slot.pre_sketch_cam),
|
||||
pre_sketch_marker: std::mem::replace(&mut app.pre_sketch_marker, slot.pre_sketch_marker),
|
||||
view: take_view(app),
|
||||
};
|
||||
put_view(app, slot.view);
|
||||
// Views cache by revision: the incoming design must not look unchanged.
|
||||
app.session.revision = app.session.revision.max(out_rev) + 1;
|
||||
app.ui.tab = if app.session.active_sketch.is_some() { "SKETCH".into() } else { "SOLID".into() };
|
||||
out
|
||||
}
|
||||
|
||||
/// Make tab `i` the active design.
|
||||
pub fn switch(app: &mut SolveApp, i: usize) {
|
||||
if i == app.docs.active || i >= app.docs.slots.len() {
|
||||
return;
|
||||
}
|
||||
let Some(incoming) = app.docs.slots.get_mut(i).and_then(Option::take) else { return };
|
||||
let out = swap_in(app, incoming);
|
||||
let a = app.docs.active;
|
||||
if let Some(s) = app.docs.slots.get_mut(a) {
|
||||
*s = Some(out);
|
||||
}
|
||||
app.docs.active = i;
|
||||
}
|
||||
|
||||
/// Open `session` in a new tab after the active one and switch to it (`fit`: frame its model).
|
||||
pub fn open_tab(app: &mut SolveApp, session: Session) -> Result<(), String> {
|
||||
if app.docs.slots.is_empty() {
|
||||
app.docs.slots.push(None);
|
||||
app.docs.active = 0;
|
||||
}
|
||||
if app.docs.slots.len() >= MAX_OPEN {
|
||||
return Err(format!("at most {MAX_OPEN} designs can be open"));
|
||||
}
|
||||
let at = app.docs.active + 1;
|
||||
app.docs.slots.insert(at, Some(DocSlot::new(session)));
|
||||
switch(app, at);
|
||||
app.fit_view();
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Is the active design an untouched new one (it can be replaced instead of opening a tab)?
|
||||
pub fn active_is_blank(app: &SolveApp) -> bool {
|
||||
let s = &app.session;
|
||||
s.path.is_none() && s.doc.features.is_empty() && s.doc.params.is_empty() && s.doc.components.is_empty() && !s.is_dirty()
|
||||
}
|
||||
|
||||
/// Show `session` (a design built or read elsewhere): in place of a blank active design,
|
||||
/// otherwise in a new tab.
|
||||
pub fn adopt(app: &mut SolveApp, session: Session) {
|
||||
if active_is_blank(app) {
|
||||
let rev = app.session.revision;
|
||||
crate::dialogs::cancel(app);
|
||||
app.tool = None;
|
||||
app.session = session;
|
||||
app.session.revision = app.session.revision.max(rev) + 1;
|
||||
app.cam = Camera::default();
|
||||
app.fit_view();
|
||||
} else if let Err(e) = open_tab(app, session) {
|
||||
app.set_status(e, true);
|
||||
}
|
||||
}
|
||||
|
||||
/// A new, empty design in its own tab.
|
||||
pub fn new_design(app: &mut SolveApp) {
|
||||
app.home.open = false;
|
||||
if active_is_blank(app) {
|
||||
return;
|
||||
}
|
||||
if let Err(e) = open_tab(app, Session::default()) {
|
||||
app.set_status(e, true);
|
||||
}
|
||||
}
|
||||
|
||||
/// Before opening a file: a fresh tab unless the active design is blank.
|
||||
pub fn prepare_open(app: &mut SolveApp) {
|
||||
if !active_is_blank(app)
|
||||
&& let Err(e) = open_tab(app, Session::default())
|
||||
{
|
||||
app.set_status(e, true);
|
||||
}
|
||||
}
|
||||
|
||||
/// Close tab `i`: asks first when it has unsaved changes (`force`: close anyway).
|
||||
pub fn close(app: &mut SolveApp, i: usize, force: bool) {
|
||||
let n = app.docs.count();
|
||||
if i >= n {
|
||||
return;
|
||||
}
|
||||
if !force && dirty(app, i) {
|
||||
app.docs.closing = Some(i);
|
||||
return;
|
||||
}
|
||||
app.docs.closing = None;
|
||||
if n <= 1 {
|
||||
// The last design: a blank one takes its place.
|
||||
let rev = app.session.revision;
|
||||
crate::dialogs::cancel(app);
|
||||
app.tool = None;
|
||||
app.session = Session::default();
|
||||
app.session.revision = rev + 1;
|
||||
app.cam = Camera::default();
|
||||
app.fit_view();
|
||||
put_view(app, DocView::default());
|
||||
app.docs = Documents::default();
|
||||
app.home.open = true;
|
||||
return;
|
||||
}
|
||||
if i == app.docs.active {
|
||||
// Show a neighbour first, then drop this one.
|
||||
let next = if i + 1 < n { i + 1 } else { i - 1 };
|
||||
switch(app, next);
|
||||
}
|
||||
app.docs.slots.remove(i);
|
||||
if app.docs.active > i {
|
||||
app.docs.active -= 1;
|
||||
}
|
||||
}
|
||||
|
||||
fn dirty(app: &SolveApp, i: usize) -> bool {
|
||||
if i == app.docs.active || app.docs.slots.is_empty() {
|
||||
return app.session.is_dirty();
|
||||
}
|
||||
app.docs.slots.get(i).and_then(Option::as_ref).is_some_and(|s| s.session.is_dirty())
|
||||
}
|
||||
|
||||
/// Tab names (with an unsaved-changes flag), in order.
|
||||
pub fn tabs_info(app: &SolveApp) -> Vec<(String, bool)> {
|
||||
if app.docs.slots.is_empty() {
|
||||
return vec![(app.session.doc.name.clone(), app.session.is_dirty())];
|
||||
}
|
||||
app.docs
|
||||
.slots
|
||||
.iter()
|
||||
.map(|s| match s {
|
||||
Some(d) => (d.session.doc.name.clone(), d.session.is_dirty()),
|
||||
None => (app.session.doc.name.clone(), app.session.is_dirty()),
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// The control channel's `ui.documents`: list, `new`, `switch` or `close` (by index; `force`
|
||||
/// closes without asking).
|
||||
pub fn control(app: &mut SolveApp, p: &Value) -> Value {
|
||||
let i = p.get("index").and_then(Value::as_u64).map(|x| x as usize);
|
||||
match p.get("action").and_then(Value::as_str) {
|
||||
Some("new") => new_design(app),
|
||||
Some("switch") => switch(app, i.unwrap_or(app.docs.active)),
|
||||
Some("close") => close(app, i.unwrap_or(app.docs.active), p.get("force").and_then(Value::as_bool).unwrap_or(false)),
|
||||
_ => {}
|
||||
}
|
||||
let tabs: Vec<Value> = tabs_info(app).into_iter().map(|(name, dirty)| json!({"name": name, "dirty": dirty})).collect();
|
||||
json!({"documents": tabs, "active": app.docs.active, "closing": app.docs.closing})
|
||||
}
|
||||
|
||||
/// The document tabs in the application bar, from `x0` to `x1`: click to switch, × to close,
|
||||
/// + for a new design.
|
||||
pub fn tabs(app: &mut SolveApp, ui: &mut egui::Ui, r: Rect, x0: f32, x1: f32) {
|
||||
let t = Tokens::get();
|
||||
let info = tabs_info(app);
|
||||
let n = info.len();
|
||||
let avail = (x1 - x0 - 34.0).max(80.0);
|
||||
let w = (avail / n as f32).clamp(90.0, 220.0);
|
||||
let mut x = x0;
|
||||
let mut pick: Option<usize> = None;
|
||||
let mut shut: Option<usize> = None;
|
||||
for (i, (name, dirty)) in info.iter().enumerate() {
|
||||
let tr = Rect::from_min_size(pos2(x, r.top() + 5.0), vec2(w - 2.0, r.height() - 5.0));
|
||||
let active = i == app.docs.active || app.docs.slots.is_empty();
|
||||
let resp = ui.interact(tr, ui.id().with(("doc_tab", i)), Sense::click_and_drag());
|
||||
// The tabs are part of the title bar: dragging one moves the window, a double click
|
||||
// maximizes it.
|
||||
if app.custom_titlebar || app.integrated_titlebar {
|
||||
if resp.drag_started_by(egui::PointerButton::Primary) {
|
||||
ui.ctx().send_viewport_cmd(egui::ViewportCommand::StartDrag);
|
||||
} else if resp.double_clicked() {
|
||||
crate::titlebar::toggle_maximize(ui.ctx());
|
||||
}
|
||||
}
|
||||
let fill = if active {
|
||||
t.toolbar
|
||||
} else if resp.hovered() {
|
||||
Color32::from_white_alpha(28)
|
||||
} else {
|
||||
Color32::from_white_alpha(10)
|
||||
};
|
||||
ui.painter().rect_filled(tr, egui::CornerRadius { nw: 5, ne: 5, sw: 0, se: 0 }, fill);
|
||||
let ink = if active { t.text } else { t.app_bar_text };
|
||||
let label = format!("{name}{}", if *dirty { " •" } else { "" });
|
||||
let g = ui.painter().layout_no_wrap(label, FontId::proportional(13.0), ink);
|
||||
let text_w = (tr.width() - 30.0).max(10.0);
|
||||
let clip = Rect::from_min_size(tr.min, vec2(text_w + 10.0, tr.height()));
|
||||
ui.painter().with_clip_rect(clip).galley(pos2(tr.left() + 10.0, tr.center().y - g.size().y / 2.0), g, ink);
|
||||
// ×
|
||||
let xr = Rect::from_center_size(pos2(tr.right() - 13.0, tr.center().y), vec2(16.0, 16.0));
|
||||
let xresp = ui.interact(xr, ui.id().with(("doc_close", i)), Sense::click());
|
||||
if xresp.hovered() {
|
||||
ui.painter().rect_filled(xr, 3.0, Color32::from_white_alpha(40));
|
||||
}
|
||||
let c = xr.center();
|
||||
let s = Stroke::new(1.3, if active { t.text_dim } else { t.app_bar_text });
|
||||
ui.painter().line_segment([c - vec2(3.5, 3.5), c + vec2(3.5, 3.5)], s);
|
||||
ui.painter().line_segment([c - vec2(3.5, -3.5), c + vec2(3.5, -3.5)], s);
|
||||
if xresp.on_hover_text("Close").clicked() {
|
||||
shut = Some(i);
|
||||
} else if resp.on_hover_text(name.as_str()).clicked() {
|
||||
pick = Some(i);
|
||||
}
|
||||
x += w;
|
||||
}
|
||||
// New design.
|
||||
let pr = Rect::from_center_size(pos2(x + 14.0, r.center().y + 2.0), vec2(22.0, 22.0));
|
||||
let presp = ui.interact(pr, ui.id().with("doc_new"), Sense::click());
|
||||
if presp.hovered() {
|
||||
ui.painter().rect_filled(pr, 4.0, Color32::from_white_alpha(30));
|
||||
}
|
||||
let c = pr.center();
|
||||
let s = Stroke::new(1.6, t.app_bar_text);
|
||||
ui.painter().line_segment([c - vec2(6.0, 0.0), c + vec2(6.0, 0.0)], s);
|
||||
ui.painter().line_segment([c - vec2(0.0, 6.0), c + vec2(0.0, 6.0)], s);
|
||||
if presp.on_hover_text("New Design (Ctrl+N)").clicked() {
|
||||
new_design(app);
|
||||
}
|
||||
if let Some(i) = shut {
|
||||
close(app, i, false);
|
||||
} else if let Some(i) = pick {
|
||||
switch(app, i);
|
||||
}
|
||||
}
|
||||
|
||||
/// The "save changes?" prompt for a tab being closed.
|
||||
pub fn prompt(app: &mut SolveApp, ctx: &egui::Context) {
|
||||
let Some(i) = app.docs.closing else { return };
|
||||
let name = tabs_info(app).get(i).map(|x| x.0.clone()).unwrap_or_default();
|
||||
let mut answer: Option<u8> = None;
|
||||
egui::Window::new("Save changes?")
|
||||
.id(egui::Id::new("sc_close_prompt"))
|
||||
.collapsible(false)
|
||||
.resizable(false)
|
||||
.anchor(Align2::CENTER_CENTER, vec2(0.0, 0.0))
|
||||
.show(ctx, |ui| {
|
||||
ui.label(format!("{name} has unsaved changes."));
|
||||
ui.add_space(8.0);
|
||||
ui.horizontal(|ui| {
|
||||
if ui.button("Save").clicked() {
|
||||
answer = Some(0);
|
||||
}
|
||||
if ui.button("Don't Save").clicked() {
|
||||
answer = Some(1);
|
||||
}
|
||||
if ui.button("Cancel").clicked() {
|
||||
answer = Some(2);
|
||||
}
|
||||
});
|
||||
});
|
||||
if ctx.input(|x| x.key_pressed(egui::Key::Escape)) {
|
||||
answer = Some(2);
|
||||
app.esc_handled = true;
|
||||
}
|
||||
match answer {
|
||||
Some(0) => {
|
||||
switch(app, i);
|
||||
crate::toolbar::save(app);
|
||||
// Saved (not cancelled in the file picker): close it.
|
||||
if !app.session.is_dirty() {
|
||||
close(app, app.docs.active, true);
|
||||
} else {
|
||||
app.docs.closing = None;
|
||||
}
|
||||
}
|
||||
Some(1) => close(app, i, true),
|
||||
Some(2) => app.docs.closing = None,
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::Services;
|
||||
|
||||
fn app() -> SolveApp {
|
||||
SolveApp::new(Session::default(), Services::default())
|
||||
}
|
||||
|
||||
/// Each tab keeps its own design, undo, selection and camera; closing asks when there are
|
||||
/// unsaved changes; the last tab closing leaves a blank design.
|
||||
#[test]
|
||||
fn tabs_keep_their_own_design() {
|
||||
let mut a = app();
|
||||
a.run("PrimitiveBox", json!({"length": 10, "width": 10, "height": 10})).unwrap();
|
||||
a.session.selection = vec![solvecraft_engine::Sel::Body { name: "Body1".into() }];
|
||||
a.cam.distance = 123.0;
|
||||
new_design(&mut a);
|
||||
assert_eq!(a.docs.count(), 2);
|
||||
assert_eq!(a.docs.active, 1);
|
||||
assert!(a.session.doc.features.is_empty() && a.session.selection.is_empty());
|
||||
a.run("PrimitiveSphere", json!({"diameter": 8})).unwrap();
|
||||
a.run("PrimitiveSphere", json!({"diameter": 4})).unwrap();
|
||||
switch(&mut a, 0);
|
||||
assert_eq!(a.session.doc.features.len(), 1);
|
||||
assert_eq!(a.session.selection.len(), 1);
|
||||
assert!((a.cam.distance - 123.0).abs() < 1e-9);
|
||||
a.run("UndoCommand", json!({})).unwrap();
|
||||
assert!(a.session.doc.features.is_empty(), "undo is this design's");
|
||||
switch(&mut a, 1);
|
||||
assert_eq!(a.session.doc.features.len(), 2, "the other design kept its features");
|
||||
// Unsaved: closing asks, Don't Save closes.
|
||||
close(&mut a, 1, false);
|
||||
assert_eq!(a.docs.closing, Some(1));
|
||||
assert_eq!(a.docs.count(), 2);
|
||||
close(&mut a, 1, true);
|
||||
assert_eq!(a.docs.count(), 1);
|
||||
assert_eq!(a.docs.active, 0);
|
||||
close(&mut a, 0, true);
|
||||
assert!(active_is_blank(&a) && a.home.open);
|
||||
}
|
||||
|
||||
/// A design built elsewhere replaces a blank one and gets a tab otherwise.
|
||||
#[test]
|
||||
fn adopt_reuses_a_blank_design() {
|
||||
let mut a = app();
|
||||
let mut s = Session::default();
|
||||
s.run_script(&solvecraft_engine::sample::script()).unwrap();
|
||||
adopt(&mut a, s);
|
||||
assert_eq!(a.docs.count(), 1);
|
||||
assert!(!a.session.doc.features.is_empty());
|
||||
adopt(&mut a, Session::default());
|
||||
assert_eq!(a.docs.count(), 2);
|
||||
let v = control(&mut a, &json!({"action": "switch", "index": 0}));
|
||||
assert_eq!(v["active"], 0);
|
||||
assert_eq!(v["documents"].as_array().map(Vec::len), Some(2));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user