diff --git a/crates/ui-patterns/src/patterns/form_dialogs/export.rs b/crates/ui-patterns/src/patterns/form_dialogs/export.rs index 344ca8929..1e9b40ca2 100644 --- a/crates/ui-patterns/src/patterns/form_dialogs/export.rs +++ b/crates/ui-patterns/src/patterns/form_dialogs/export.rs @@ -31,7 +31,6 @@ craft_ui::words! { title: "export.title" = "Export As"; export: "export.export" = "Export…"; format: "export.format" = "Format"; - formats: "export.formats" = "Formats"; quality: "export.quality" = "Quality"; lossless: "export.lossless" = "Lossless"; transparency: "export.transparency" = "Transparency"; diff --git a/crates/ui-patterns/src/patterns/form_dialogs/export/as_dialog.rs b/crates/ui-patterns/src/patterns/form_dialogs/export/as_dialog.rs index 750993406..6e15e7f35 100644 --- a/crates/ui-patterns/src/patterns/form_dialogs/export/as_dialog.rs +++ b/crates/ui-patterns/src/patterns/form_dialogs/export/as_dialog.rs @@ -1,5 +1,5 @@ -//! `ExportAsDialog`: File, Export, Export As. The settings are on the left (the format list, its options, metadata, -//! colour profile and image size); the preview with the size estimate is on the right. The dialog never encodes: it +//! `ExportAsDialog`: File, Export, Export As. The settings are on the left (the format, its options, metadata, colour +//! profile and image size); the preview with the size estimate is on the right. The dialog never encodes: it //! reports the revision of the settings it wants a preview for and shows the answer the app gives back. use super::{ @@ -9,19 +9,14 @@ use super::{ use crate::runtime::requests::{HostAnswer, PathFilter, PathRequest}; use crate::choice::Checkbox; -use crate::contract::{ - ActivateOn, Bind, CollectionEvent, Entry, NoValue, Outcome, Props as _, Remember as _, SelectMode, Show as _, ShowCollection as _, - ShowContainer as _, Sizing, -}; +use crate::contract::{Bind, Entry, NoValue, Outcome, Props as _, Remember as _, Show as _, ShowContainer as _}; use crate::display::{Shade, Text}; -use crate::form::{Field, SliderField, SliderFieldLayout}; +use crate::form::{Field, FieldGroup, SliderField, SliderFieldLayout}; use crate::layout_components::{Row, Stack}; -use crate::list::{List, ListRow}; - use crate::patterns::form_dialogs::{ FormDialog, FormOutput, HostRequests, LinkedSize, MAX_DOCUMENT_SIDE, PreviewPane, PreviewRequest, PreviewState, PreviewView, Resample, ResetFooter, ResetPick, SizeError, SizingWords, resize_from_scale, @@ -30,11 +25,11 @@ use crate::pickers::Select; use crate::runtime::env::{Env, Label, UnitKind, Units}; use crate::runtime::overlay::CloseReason; -use crate::sections::Section; +use crate::sections::{HeaderStrength, Section}; use crate::style::TypeRole; -use crate::text::{LinkMode, LinkedWords, NumberField, link_toggle}; +use crate::text::NumberField; -use craft_behavior::{DisplayOrder, ItemSource, PixelSize, Selection, SelectionChange}; +use craft_behavior::PixelSize; use craft_theme::variant::Tone; use egui::{Response, Ui}; @@ -125,9 +120,9 @@ impl Outcome for ExportAsOutput { /// File, Export, Export As: format, size, quality, metadata, colour profile, a preview and a size estimate the app /// computes. /// -/// - The settings: the format list, then that format's rows (Lossless, Quality, Bits/Pixel, Transparency), Metadata, -/// Color Space with Embed Color Profile, and Image Size (Scale, Width and Height with the proportion link, Resample). -/// - Keys: arrows move through the format list, Tab walks the fields, Enter is Export and Escape cancels. Holding Alt +/// - The settings: the format, then that format's rows (Lossless, Quality, Bits/Pixel, Transparency), Metadata, +/// Color Space with Embed Color Profile, and Image Size (Scale, Width, Height, Constrain Proportions, Resample). +/// - Keys: Tab walks the fields, Enter is Export and Escape cancels. Holding Alt /// turns Cancel into Reset, which restores the settings the dialog opened with. Export asks the app for a file /// to write (`ExportAsOutput::requests`) and the dialog stays open until the app answers with the path. /// - Settings: the dialog opens on the value in the bind, fitted to the document, and writes its edits back. @@ -181,26 +176,14 @@ impl<'a> ExportAsDialog<'a> { let ExportAsDialog { file_name, source, bound, formats, open, defaults, preview, answers, saving } = self; let env = Env::of(ui); let words = env.words::(); - let pass = Pass { - formats: &formats, - source, - words: &words, - sizing: env.words::(), - link: LinkMode::Ratio.label(&env.words::()), - units: env.units(), - defaults, - }; + let pass = Pass { formats: &formats, source, words: &words, sizing: env.words::(), units: env.units(), defaults }; let reset = ResetFooter::new(ui, None, true); let wanted = RefCell::new(None::>); let latest = RefCell::new(None::); let answered = RefCell::new(None::); - let mut dialog = FormDialog::new(words.title.clone(), bound) - .ok_label(words.export.clone()) - .ok_enabled(!saving) - .accept_stays_open(true) - .collection_body(true) - .answers(answers); + let mut dialog = + FormDialog::new(words.title.clone(), bound).ok_label(words.export.clone()).ok_enabled(!saving).accept_stays_open(true).answers(answers); if let Some(open) = open { dialog = dialog.opened(open); } @@ -219,7 +202,9 @@ impl<'a> ExportAsDialog<'a> { let mut held = form.memory::().clone(); held.adopt(preview.as_ref()); Row::new().show(ui, |ui, _| { - Stack::new().show(ui, |ui, _| pass.settings(ui, values, &mut held)); + Stack::new().show(ui, |ui, _| { + FieldGroup::new(words.title.clone()).show(ui, |ui, _| pass.settings(ui, values, &mut held)); + }); Stack::new().show(ui, |ui, _| pass.preview(ui, values, &mut held)); }); *wanted.borrow_mut() = held.request(values); @@ -250,50 +235,17 @@ struct Pass<'p> { source: PixelSize, words: &'p ExportWords, sizing: std::sync::Arc, - link: Label, units: Units, defaults: ExportFormatDefaults, } -/// The format list's rows, keyed by position. -struct FormatRows<'a>(&'a [ExportFormat]); - -impl DisplayOrder for FormatRows<'_> { - fn len(&self) -> usize { - self.0.len() - } - - fn key(&self, at: usize) -> usize { - at - } - - fn text(&self, at: usize) -> Option> { - self.0.get(at).map(|format| std::borrow::Cow::Borrowed(format.name)) - } -} - -impl ItemSource for FormatRows<'_> {} - impl Pass<'_> { fn settings(&self, ui: &mut Ui, options: &mut ExportOptions, held: &mut Held) { let words = self.words; let chosen = self.formats.iter().position(|format| format.id == options.format).unwrap_or(0); - let listed = List::::new(words.formats.clone()) - .select(SelectMode::Single) - .activate(ActivateOn::Click) - .allow_empty(false) - .header(false) - .sizing(Sizing::Content) - .selection(Bind::given(Selection::single(chosen))) - .show_items(ui, &FormatRows(self.formats), &mut |key, _| ListRow::new(self.formats[*key].name)); + let entries: Vec> = self.formats.iter().enumerate().map(|(at, format)| Entry::new(at, format.name)).collect(); let mut now = chosen; - for event in listed.events { - if let CollectionEvent::Selection(SelectionChange::Set(keys)) = event - && let Some(key) = keys.into_iter().last() - { - now = key; - } - } + choose(ui, &words.format, "format", &entries, &mut now); if now != chosen { self.switch(options, now); } @@ -333,7 +285,10 @@ impl Pass<'_> { choose(ui, &words.color_space, "profile", &profiles, &mut options.profile); check(ui, &words.embed_profile, "embed", &mut options.embed_profile); - Section::fixed(words.image_size.clone()).id_salt("size").show(ui, |ui, _| self.size(ui, options, held, format)); + Section::fixed(words.image_size.clone()) + .strength(HeaderStrength::Caption) + .id_salt("size") + .show(ui, |ui, _| self.size(ui, options, held, format)); } /// The format list picked `index`: the format takes the app's default quality (and WebP mode). @@ -351,7 +306,7 @@ impl Pass<'_> { } } - /// Scale, Width and Height with the proportion link, Resample and the notes under them. The sides are edited through + /// Scale, Width, Height, Constrain Proportions, Resample and the notes under them. The sides are edited through /// a [`LinkedSize`], the one model of linked width and height. fn size(&self, ui: &mut Ui, options: &mut ExportOptions, held: &mut Held, format: &ExportFormat) { let words = self.words; @@ -376,35 +331,33 @@ impl Pass<'_> { scaled = field.edit.value().copied().flatten(); }); let mut resized = false; - Row::new().show(ui, |ui, _| { - Stack::new().show(ui, |ui, _| { - for (salt, name, value, is_width) in [("width", &words.width, size.width, true), ("height", &words.height, size.height, false)] { - row(ui, name, salt, |ui| { - let field = NumberField::new(name.clone(), Bind::given(Some(f64::from(value)))) - .unit_kind(UnitKind::Pixels) - .step(UnitKind::Pixels.step()) - .range(1.0..=MAX_DOCUMENT_SIDE) - .show(ui); - if let Some(value) = field.edit.value().copied().flatten() { - if is_width { - linked.set_width(value); - } else { - linked.set_height(value); - } - resized = true; - } - }); - } - }); - if let Some(on) = link_toggle(self.link.clone(), Bind::given(linked.is_linked())).id_salt("link").show(ui).value().copied() { - linked.lock(on); - options.lock_aspect = on; - if on { - linked.set_width(f64::from(size.width)); + for (salt, name, value, is_width) in [("width", &words.width, size.width, true), ("height", &words.height, size.height, false)] { + row(ui, name, salt, |ui| { + let field = NumberField::new(name.clone(), Bind::given(Some(f64::from(value)))) + .unit_kind(UnitKind::Pixels) + .step(UnitKind::Pixels.step()) + .range(1.0..=MAX_DOCUMENT_SIDE) + .show(ui); + if let Some(value) = field.edit.value().copied().flatten() { + if is_width { + linked.set_width(value); + } else { + linked.set_height(value); + } resized = true; } + }); + } + let mut constrain = options.lock_aspect; + check(ui, &words.constrain, "constrain", &mut constrain); + if constrain != options.lock_aspect { + linked.lock(constrain); + options.lock_aspect = constrain; + if constrain { + linked.set_width(f64::from(size.width)); + resized = true; } - }); + } match scaled { Some(scale) => match resize_from_scale(source, scale) { Ok(_) => { diff --git a/crates/ui-patterns/tests/it/form_dialogs/export.rs b/crates/ui-patterns/tests/it/form_dialogs/export.rs index 81abae334..91b3ab253 100644 --- a/crates/ui-patterns/tests/it/form_dialogs/export.rs +++ b/crates/ui-patterns/tests/it/form_dialogs/export.rs @@ -3,7 +3,7 @@ use craft_behavior::PixelSize; use craft_ui::contract::{Bind, Role}; use craft_ui::patterns::form_dialogs::{ - ExportAsDialog, ExportOptions, ExportOptionsKind, FormatOptions, FormatOptionsDialog, JpegOptions, OutputPathRow, + ExportAsDialog, ExportOptions, ExportOptionsKind, ExportSize, FormatOptions, FormatOptionsDialog, JpegOptions, OutputPathRow, }; use craft_ui::runtime::requests::PathRequest; use craft_ui::testing::{Fixture, trial}; @@ -46,6 +46,42 @@ fn the_default_file_name_is_made_safe() { assert_eq!(requested_file(&long).len(), 80 + ".png".len(), "at most 80 characters"); } +/// Export As picks its format from a select: JPG brings its Quality row. With Constrain Proportions on, a typed width +/// takes the height with it; off, the height stays. +#[trial] +fn export_as_picks_a_format_and_constrains_the_size_by_its_check_box() { + let options = Rc::new(RefCell::new(ExportOptions::default())); + let shared = Rc::clone(&options); + let mut fixture = Fixture::new(move |ui| { + let mut current = shared.borrow_mut(); + let _ = ExportAsDialog::new("Poster", document(), Bind::bound(&mut *current)).show(ui); + }); + fixture.settle(); + assert!(fixture.by_label("Quality").is_none(), "PNG has no quality"); + let format = fixture.by_label("Format").expect("the format select"); + fixture.click(&format).settle(); + let jpg = fixture.by_label("JPG").expect("the select offers JPG"); + fixture.click(&jpg).settle(); + assert_eq!(options.borrow().format, "jpg"); + assert!(fixture.by_label("Quality").is_some(), "JPG shows its Quality row"); + + let type_width = |fixture: &mut Fixture, text: &str| { + let width = fixture.by_label("Width").expect("the width field"); + fixture.click(&width).settle(); + fixture.key(Key::A, Modifiers::COMMAND); + fixture.type_text(text); + fixture.key(Key::Enter, Modifiers::NONE).settle(); + }; + type_width(&mut fixture, "600"); + assert_eq!(options.borrow().size, ExportSize::pixels(600, 400), "constrained, the height follows the width"); + + let constrain = fixture.by_label("Constrain Proportions").expect("the check box under Height"); + fixture.click(&constrain).settle(); + assert!(!options.borrow().lock_aspect, "the check box turns the constraint off"); + type_width(&mut fixture, "900"); + assert_eq!(options.borrow().size, ExportSize::pixels(900, 400), "unconstrained, the height stays"); +} + /// The JPEG options dialog over `quality`, recording what OK answers. fn jpeg_dialog(quality: u8) -> (Fixture, Rc>>) { let answers = Rc::new(RefCell::new(Vec::new()));