diff --git a/crates/ui-patterns/src/patterns/form_dialogs/export/options.rs b/crates/ui-patterns/src/patterns/form_dialogs/export/options.rs index 39e428fbc..7605f5fd6 100644 --- a/crates/ui-patterns/src/patterns/form_dialogs/export/options.rs +++ b/crates/ui-patterns/src/patterns/form_dialogs/export/options.rs @@ -15,6 +15,7 @@ use crate::text::NumberField; use crate::value_drag::Slider; use egui::{Response, Ui}; use serde::{Deserialize, Serialize}; +use std::sync::Arc; craft_ui::words! { /// The words of the format options dialogs. @@ -467,7 +468,7 @@ fn options_key(kind: ExportOptionsKind) -> &'static str { /// with. It answers with the [`FormatOptions`] at OK; Cancel abandons the save. /// /// ```ignore -/// host.open(HostedFormatOptions::new(ExportOptionsKind::Jpeg).initial(FormatOptions::Jpeg(JpegOptions::new(10)))); +/// host.open(HostedFormatOptions::new(ctx, ExportOptionsKind::Jpeg).initial(FormatOptions::Jpeg(JpegOptions::new(10)))); /// if let Some(DialogResult::Ok(options)) = host.take::() { /// save_with(options); /// } @@ -478,11 +479,13 @@ pub struct HostedFormatOptions { initial: Option, tiff: TiffDocument, open: bool, - /// The values of the rows: the dialog edits them in place, and automation reads and writes the same ones. + /// The words of the rows, from the root when the dialog was made. + words: Arc, + /// The values of the rows, open from construction: the dialog edits them in place, and automation reads and writes + /// the same ones. fields: DialogFields, - /// The values right after the fields were opened (defaults filled): what Reset restores. `None` before the fields - /// are opened. - opening: Option, + /// The values right after the fields were opened (defaults filled): what Reset restores. + opening: DialogFields, /// The numbering of the options the estimate is asked for. revisions: Revisions, /// The request the app has not taken yet. @@ -508,22 +511,26 @@ impl HostedFormatOptions { } } - /// The options dialog of `kind`. - pub fn new(kind: ExportOptionsKind) -> Self { - HostedFormatOptions { + /// The options dialog of `kind`, its fields open at once, so automation lists and sets them before the first + /// pass. + pub fn new(ctx: &egui::Context, kind: ExportOptionsKind) -> Self { + let mut dialog = HostedFormatOptions { id: dialog_id(options_key(kind)), kind, initial: None, tiff: TiffDocument::default(), open: true, + words: Env::of_root(ctx).words::(), fields: DialogFields::new(), - opening: None, + opening: DialogFields::new(), revisions: Revisions::default(), wanted: None, estimate: None, #[cfg(feature = "testing")] facts: crate::testing::StoryOutput::default(), - } + }; + dialog.open_fields(); + dialog } /// The options the dialog starts from. @@ -531,21 +538,23 @@ impl HostedFormatOptions { start_of(self.kind, self.initial) } - /// The parameter list the dialog shows, and the fields opened for it on the first call. - fn opened_params(&mut self, ctx: &egui::Context) -> Vec { - let words = Env::of_root(ctx).words::(); - let params = params(&words, self.start(), self.tiff); - if self.opening.is_none() { - open_fields(¶ms, &mut self.fields); - self.opening = Some(self.fields.clone()); - } - params + /// The parameter list the dialog shows. + fn params(&self) -> Vec { + params(&self.words, self.start(), self.tiff) + } + + /// Opens the fields from the start, with the defaults filled; the opening values Reset restores are these. + fn open_fields(&mut self) { + self.fields = DialogFields::new(); + open_fields(&self.params(), &mut self.fields); + self.opening = self.fields.clone(); } /// The options the dialog opens with, when they are the options of its format. #[must_use] pub fn initial(mut self, options: FormatOptions) -> Self { self.initial = Some(options); + self.open_fields(); self } @@ -554,6 +563,7 @@ impl HostedFormatOptions { #[must_use] pub fn tiff_document(mut self, layered: bool, transparent: bool, layer_note: bool) -> Self { self.tiff = TiffDocument { layered, transparent, layer_note }; + self.open_fields(); self } @@ -567,8 +577,7 @@ impl StackDialog for HostedFormatOptions { type Result = FormatOptions; /// Answers OK as the button does, from the values the rows show. - fn confirm(&mut self, ctx: &egui::Context) -> Option { - self.opened_params(ctx); + fn confirm(&mut self, _: &egui::Context) -> Option { Some(answer(self.start(), &self.fields)) } @@ -579,9 +588,8 @@ impl StackDialog for HostedFormatOptions { /// Sets the value of the row `field` names when the row is shown, takes input and takes the value, as editing it /// would. - fn set_json_field(&mut self, ctx: &egui::Context, field: &str, value: serde_json::Value) -> Result<(), String> { - let params = self.opened_params(ctx); - set_param_field(¶ms, &mut self.fields, field, value) + fn set_json_field(&mut self, _: &egui::Context, field: &str, value: serde_json::Value) -> Result<(), String> { + set_param_field(&self.params(), &mut self.fields, field, value) } fn id(&self) -> DialogId { @@ -589,7 +597,6 @@ impl StackDialog for HostedFormatOptions { } fn show(&mut self, ui: &mut Ui, _: &DialogStack) -> Option> { - self.opened_params(ui.ctx()); let shown = FormatOptionsDialog { kind: self.kind, open: Some(Bind::bound(&mut self.open)), @@ -597,7 +604,7 @@ impl StackDialog for HostedFormatOptions { estimate: self.estimate.map(|(_, estimate)| estimate), tiff: self.tiff, values: Some(Bind::bound(&mut self.fields)), - opening: self.opening.clone(), + opening: Some(self.opening.clone()), } .show(ui); #[cfg(feature = "testing")] diff --git a/crates/ui-patterns/src/patterns/form_dialogs/export/stories.rs b/crates/ui-patterns/src/patterns/form_dialogs/export/stories.rs index d011363c9..1f6977f0d 100644 --- a/crates/ui-patterns/src/patterns/form_dialogs/export/stories.rs +++ b/crates/ui-patterns/src/patterns/form_dialogs/export/stories.rs @@ -88,7 +88,8 @@ fn export_as_rendering(ui: &mut Ui, data: &mut StoryData) -> StoryOutput { fn jpeg_options(ui: &mut Ui, data: &mut StoryData) -> StoryOutput { let quality = *data.ranged("quality", 6_u8, 0.0..=12.0); let answer = (*data.choice("estimate", "exact", &ESTIMATES)).to_owned(); - let open = || HostedFormatOptions::new(ExportOptionsKind::Jpeg).initial(FormatOptions::Jpeg(JpegOptions::new(quality))); + let ctx = ui.ctx().clone(); + let open = move || HostedFormatOptions::new(&ctx, ExportOptionsKind::Jpeg).initial(FormatOptions::Jpeg(JpegOptions::new(quality))); hosted_with(ui, data, (quality, answer.clone()), open, |host| { let Some(dialog) = host.get_mut::() else { return }; let Some(wanted) = dialog.wanted_estimate() else { return }; @@ -109,8 +110,9 @@ fn tiff_options(ui: &mut Ui, data: &mut StoryData) -> StoryOutput { let layered = *data.value("layered", true); let transparent = *data.value("transparent", true); let layer_note = *data.value("layer_note", true); - hosted(ui, data, (layered, transparent, layer_note), || { - HostedFormatOptions::new(ExportOptionsKind::Tiff).tiff_document(layered, transparent, layer_note) + let ctx = ui.ctx().clone(); + hosted(ui, data, (layered, transparent, layer_note), move || { + HostedFormatOptions::new(&ctx, ExportOptionsKind::Tiff).tiff_document(layered, transparent, layer_note) }) } @@ -129,14 +131,16 @@ fn export_as_with_presets(ui: &mut Ui, data: &mut StoryData) -> StoryOutput { #[story(FormatOptionsDialog<'static>, covers = [], drive = Drive::Never)] fn targa_options(ui: &mut Ui, data: &mut StoryData) -> StoryOutput { let alpha = *data.value("alpha", true); - hosted(ui, data, alpha, || { - HostedFormatOptions::new(ExportOptionsKind::Targa).initial(FormatOptions::Targa(TargaOptions::new(if alpha { 32 } else { 24 }))) + let ctx = ui.ctx().clone(); + hosted(ui, data, alpha, move || { + HostedFormatOptions::new(&ctx, ExportOptionsKind::Targa).initial(FormatOptions::Targa(TargaOptions::new(if alpha { 32 } else { 24 }))) }) } #[story(FormatOptionsDialog<'static>, covers = [], drive = Drive::Never)] fn dds_options(ui: &mut Ui, data: &mut StoryData) -> StoryOutput { - hosted(ui, data, (), || HostedFormatOptions::new(ExportOptionsKind::Dds)) + let ctx = ui.ctx().clone(); + hosted(ui, data, (), move || HostedFormatOptions::new(&ctx, ExportOptionsKind::Dds)) } const TEMPLATE_PATH: &str = "[Comp Name].[fileExtension]"; diff --git a/crates/ui-patterns/tests/it/form_dialogs/export.rs b/crates/ui-patterns/tests/it/form_dialogs/export.rs index 7ac4ec716..e1cd15c47 100644 --- a/crates/ui-patterns/tests/it/form_dialogs/export.rs +++ b/crates/ui-patterns/tests/it/form_dialogs/export.rs @@ -178,7 +178,8 @@ fn a_format_estimate_shows_only_the_answer_for_the_current_values() { let shown = Rc::clone(&host); let mut fixture = Fixture::new(move |ui| shown.borrow_mut().run(ui)); fixture.room(Vec2::new(1400.0, 1000.0)); - host.borrow_mut().open(HostedFormatOptions::new(ExportOptionsKind::Jpeg).initial(FormatOptions::Jpeg(JpegOptions::new(6)))); + let jpeg = HostedFormatOptions::new(fixture.ctx(), ExportOptionsKind::Jpeg).initial(FormatOptions::Jpeg(JpegOptions::new(6))); + host.borrow_mut().open(jpeg); fixture.idle(10); let waiting = painted(&fixture);