diff --git a/crates/ui-egui/src/dialogs/guide_layout_ui.rs b/crates/ui-egui/src/dialogs/guide_layout_ui.rs index b2940c7f8b..5c55773a49 100644 --- a/crates/ui-egui/src/dialogs/guide_layout_ui.rs +++ b/crates/ui-egui/src/dialogs/guide_layout_ui.rs @@ -426,7 +426,11 @@ fn unit_edit(app: &PhotocraftApp, ui: &mut egui::Ui, id_salt: &str, value: &mut } if response.lost_focus() { let unit = ui.ctx().data_mut(|d| d.remove_temp::(response.id)).unwrap_or(ruler); - if let Some(normalized) = normalize_field_text(&text, app, along_x, optional, unit) { + // Leaving a field untouched keeps its stored value (an automatic size stays empty), so + // tabbing past it does not turn a named preset into Custom. + if let Some(normalized) = normalize_field_text(&text, app, along_x, optional, unit) + && normalized != text + { *value = json!(normalized); } } diff --git a/crates/ui-egui/src/dialogs/guide_layout_ui/tests.rs b/crates/ui-egui/src/dialogs/guide_layout_ui/tests.rs index 637dde6d8c..e434ea237b 100644 --- a/crates/ui-egui/src/dialogs/guide_layout_ui/tests.rs +++ b/crates/ui-egui/src/dialogs/guide_layout_ui/tests.rs @@ -408,3 +408,28 @@ fn a_bare_number_takes_the_unit_the_field_showed() { h.run_steps(2); assert_eq!(h.state().ui.dialogs.first().unwrap().fields["gutter"], "5 mm"); } + +/// Tabbing past fields without typing keeps a named preset: an empty Width stays automatic. +#[test] +fn tabbing_through_untouched_fields_keeps_the_preset() { + let mut app = app(); + let id = open(&mut app); + let f = &mut app.ui.dialog_mut(id).unwrap().fields; + f.insert("__preset".into(), json!("eight")); + f.insert("columns".into(), json!(8)); + f.insert("rows".into(), json!(0)); + f.insert("__rowsEnabled".into(), json!(false)); + f.insert("__marginEnabled".into(), json!(false)); + f.insert("width".into(), Value::Null); + f.insert("gutter".into(), json!(20)); + let mut h = harness(app); + h.run_steps(3); + // Number, Width, Spacing, then back to Number. + for _ in 0..4 { + h.key_press(egui::Key::Tab); + h.run_steps(2); + } + let f = &h.state().ui.dialogs.first().unwrap().fields; + assert_eq!(f["__preset"], "eight"); + assert_eq!(f["width"], Value::Null); +}