Skip to content

SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.

Units of new designs apply to the empty design already open (#221) (#4835)

raykholobd0cc4bb5152
diff --git a/crates/ui-egui/src/prefs.rs b/crates/ui-egui/src/prefs.rs
index ddcfbd6e02..f89d8395e2 100644
--- a/crates/ui-egui/src/prefs.rs
+++ b/crates/ui-egui/src/prefs.rs
@@ -685,10 +685,14 @@ impl Snapshot {
}
fn restore(self, app: &mut SolveApp) {
let msaa = app.preferences.msaa;
+ let units_changed = app.preferences.default_units != self.prefs.default_units;
// Update bookkeeping isn't a setting: a check that finished while the dialog was open stays.
let update = std::mem::take(&mut app.preferences.update);
app.preferences = self.prefs;
app.preferences.update = update;
+ if units_changed {
+ default_units_changed(app);
+ }
app.ui.dark = self.dark;
app.ui.layout = self.layout;
app.ui.show_grid = self.grid;
@@ -857,7 +861,11 @@ fn ui_font_row(app: &mut SolveApp, ui: &mut egui::Ui) {
/// Restore Defaults for one page.
fn defaults(app: &mut SolveApp, page: usize) {
let msaa = app.preferences.msaa;
+ let units = app.preferences.default_units.clone();
reset_preferences(&mut app.preferences, page);
+ if app.preferences.default_units != units {
+ default_units_changed(app);
+ }
match page {
0 => {
app.autosave_minutes = 5.0;
@@ -941,6 +949,13 @@ pub fn apply_new_design(app: &mut SolveApp) {
apply_new_design_units(app, &app.preferences.default_units.clone());
}
+/// The new-design preference also applies to the blank, unsaved design already open.
+fn default_units_changed(app: &mut SolveApp) {
+ if crate::documents::active_is_blank(app) {
+ apply_new_design(app);
+ }
+}
+
/// Explicit units for a new-design tile; the user's default preference stays unchanged.
pub(crate) fn apply_new_design_units(app: &mut SolveApp, units: &str) {
if app.session.doc.features.is_empty() && app.session.doc.units != units {
@@ -1501,12 +1516,16 @@ pub fn set(app: &mut SolveApp, p: &serde_json::Value) -> Result<serde_json::Valu
if new.theme != app.preferences.theme && new.theme != "system" {
app.ui.dark = file.map_or(new.theme == "dark", |f| f.base.is_dark());
}
+ let units_changed = new.default_units != app.preferences.default_units;
let up_changed = new.up_axis != app.preferences.up_axis;
let msaa_changed = new.msaa != app.preferences.msaa;
if p.get("layout").is_some() {
app.ui.layout = new.layout;
}
app.preferences = new;
+ if units_changed {
+ default_units_changed(app);
+ }
if msaa_changed {
save_graphics(app);
}
@@ -1534,6 +1553,39 @@ pub(crate) fn reveal_preference(h: &mut crate::scenario::Harness, handle: &str)
#[cfg(test)]
mod tests {
+ #[test]
+ fn preferred_units_update_only_a_blank_unsaved_design() {
+ for design in ["new", "saved", "content"] {
+ let mut app = crate::SolveApp::new(solidcraft_engine::Session::default(), Default::default());
+ match design {
+ "saved" => app.session.path = Some("empty.solidcraft".into()),
+ "content" => {
+ app.session.execute("sketch.create", &serde_json::json!({"plane": "XY"})).unwrap();
+ app.session.mark_saved();
+ }
+ _ => {}
+ }
+ let dirty = app.session.is_dirty();
+ let undo = app.session.undo.len();
+ super::set(&mut app, &serde_json::json!({"default_units": "in"})).unwrap();
+ assert_eq!(app.preferences.default_units, "in");
+ assert_eq!(app.session.doc.units, if design == "new" { "in" } else { "mm" }, "{design}");
+ assert_eq!(app.session.is_dirty(), dirty, "{design}");
+ assert_eq!(app.session.undo.len(), undo, "{design}");
+ if design == "new" {
+ super::control(&mut app, &serde_json::json!({"open": "Design"})).unwrap();
+ super::set(&mut app, &serde_json::json!({"default_units": "ft"})).unwrap();
+ assert_eq!(app.session.doc.units, "ft");
+ super::control(&mut app, &serde_json::json!({"button": "cancel"})).unwrap();
+ assert_eq!(app.session.doc.units, "in");
+ super::defaults(&mut app, super::PAGE_DESIGN);
+ assert_eq!(app.session.doc.units, "mm");
+ assert!(!app.session.is_dirty());
+ assert!(app.session.undo.is_empty());
+ }
+ }
+ }
+
#[test]
fn display_quality_cards_show_increasing_facet_detail() {
let mut app = super::SolveApp::new(Default::default(), Default::default());
diff --git a/crates/ui-egui/src/prefs/design.rs b/crates/ui-egui/src/prefs/design.rs
index 4ffc7cacda..8d0cf8dc73 100644
--- a/crates/ui-egui/src/prefs/design.rs
+++ b/crates/ui-egui/src/prefs/design.rs
@@ -9,8 +9,11 @@ pub(super) fn show(app: &mut SolveApp, ui: &mut egui::Ui) {
ui_kit::row(ui, app.tr("ui.units_of_new_designs"), |ui| {
let mut selected = UNITS.iter().position(|u| *u == app.preferences.default_units).unwrap_or(0);
ui_kit::segmented(ui, &mut selected, &UNITS, ui_kit::Segments { intrinsic: true, ..Default::default() });
- if let Some(unit) = UNITS.get(selected) {
+ if let Some(unit) = UNITS.get(selected)
+ && app.preferences.default_units != *unit
+ {
app.preferences.default_units = (*unit).into();
+ default_units_changed(app);
}
});
ui_kit::row(ui, app.tr("ui.length_decimals"), |ui| {