diff --git a/crates/ui-egui/src/panels.rs b/crates/ui-egui/src/panels.rs index 487d501054..e5c7077900 100644 --- a/crates/ui-egui/src/panels.rs +++ b/crates/ui-egui/src/panels.rs @@ -618,13 +618,16 @@ pub(crate) fn label_or_name(s: &str, built_in: bool) -> &str { crate::i18n::label_or_name(crate::i18n::current(), s, built_in) } -/// "Recent Colors" header + rows of chips (the Session's recent colours, which every paint -/// command feeds), wrapped onto as many rows as the panel's width needs; returns the one clicked, -/// for the caller to apply. A chip drags its color as a solid paint, which the Swatches panel +/// Rows of chips (the Session's recent colours, which every paint command feeds), wrapped onto as +/// many rows as the panel's width needs, under a "Recent Colors" header when `heading` is set; +/// returns the one clicked, for the caller to apply. The chips sit in a group that, without the +/// header, screen readers name "Recent Colors". A chip drags its color as a solid paint, which the Swatches panel /// makes a swatch of. -pub(crate) fn recent_colors_row(app: &VectorcraftApp, ui: &mut Ui) -> Option { +pub(crate) fn recent_colors_row(app: &VectorcraftApp, ui: &mut Ui, heading: bool) -> Option { let t = Tokens::get(ui.ctx()); - crate::widgets::subheader(ui, tl!("Recent Colors")); + if heading { + crate::widgets::subheader(ui, tl!("Recent Colors")); + } let width = ui.available_width(); let colors = &app.session.recent_colors; // Chips are 16 px on a 19 px pitch, inset 3 px, with 2 px kept clear of the right edge. @@ -632,11 +635,22 @@ pub(crate) fn recent_colors_row(app: &VectorcraftApp, ui: &mut Ui) -> Option edit_group(app, &g), diff --git a/crates/ui-egui/src/panels/swatches/tests.rs b/crates/ui-egui/src/panels/swatches/tests.rs index 6c3872e97f..b2780ff197 100644 --- a/crates/ui-egui/src/panels/swatches/tests.rs +++ b/crates/ui-egui/src/panels/swatches/tests.rs @@ -1006,6 +1006,69 @@ fn show_recent_colors_hides_and_shows_the_swatches_row() { assert_eq!((saved(json!(false)), saved(json!(true)), saved(json!("no"))), (false, true, true)); } +/// The panel draws no "Recent Colors" or "Swatch Tiles" heading (#8041): the Recent Colors row +/// sits under the proxy row, empty or not, the swatch list just under it, and the list moves up +/// under the proxy row when Show Recent Colors hides the row. Screen readers still find both +/// parts by those names. +#[test] +fn the_list_sits_under_the_recent_colors_row_without_headings() { + fn texts(shapes: &[egui::Shape], out: &mut Vec) { + for s in shapes { + match s { + egui::Shape::Text(t) => out.push(t.galley.text().to_string()), + egui::Shape::Vec(v) => texts(v, out), + _ => {} + } + } + } + // The visible texts, and the bounds of the parts screen readers name "Recent Colors" and + // "Swatch Tiles", of the second of two frames. + let look = |app: &mut VectorcraftApp| { + crate::i18n::set_current(crate::i18n::Lang::EN); + let ctx = context(); + ctx.enable_accesskit(); + let mut last = None; + for time in [0.0, 0.5] { + let screen_rect = Some(Rect::from_min_size(Pos2::ZERO, vec2(280.0, 700.0))); + let mut out = ctx.run_ui(egui::RawInput { time: Some(time), screen_rect, ..Default::default() }, |ui| show(app, ui)); + out.textures_delta.clear(); + last = Some(out); + } + let out = last.expect("a frame"); + let mut shown = vec![]; + texts(&out.shapes.iter().map(|c| c.shape.clone()).collect::>(), &mut shown); + let nodes = out.platform_output.accesskit_update.map(|u| u.nodes).unwrap_or_default(); + let named = + |label: &str| nodes.iter().find(|(_, n)| n.label() == Some(label)).and_then(|(_, n)| n.bounds()).map(|b| (b.y0 as f32, b.y1 as f32)); + // The list is the node that holds the tiles, not an empty node beside them. + let list = nodes.iter().find(|(_, n)| n.label() == Some("Swatch Tiles")); + assert!(list.is_some_and(|(_, n)| n.role() == egui::accesskit::Role::List && !n.children().is_empty()), "the list holds the tiles"); + // Likewise the Recent Colors group holds its chips, one child per recent color. + let chips = nodes.iter().find(|(_, n)| n.label() == Some("Recent Colors")).map(|(_, n)| n.children().len()); + if let Some(chips) = chips { + assert_eq!(chips, app.session.recent_colors.len(), "the group holds the chips"); + } + (shown, named("Recent Colors"), named("Swatch Tiles")) + }; + let mut app = app(); + for applied in [false, true] { + if applied { + app.run("paint.setFill", json!({"color": "#ff0000"})).unwrap(); + } + let (shown, recent, list) = look(&mut app); + assert!(!shown.iter().any(|t| t == "Recent Colors" || t == "Swatch Tiles"), "no headings: {shown:?}"); + let (row_top, row_bottom) = recent.expect("screen readers find the Recent Colors row"); + let (top, _) = list.expect("screen readers find the swatch list"); + assert!(row_top < 50.0, "the row sits under the proxy row: {row_top}"); + assert!(top > row_bottom && top - row_bottom < 12.0, "the list sits under the row: {row_bottom} {top}"); + } + app.ui.swatches_show_recent_colors = false; + let (_, recent, list) = look(&mut app); + assert_eq!(recent, None, "Show Recent Colors unchecked hides the row"); + let (top, _) = list.expect("screen readers find the swatch list"); + assert!(top < 50.0, "the list starts under the proxy row: {top}"); +} + /// In a panel made taller the swatch list fills the space above the panel's footer instead of /// scrolling inside 150 or 200 pt (#1638); outside a sized panel it keeps those heights. #[test] diff --git a/crates/ui-egui/src/tests/paintchips.rs b/crates/ui-egui/src/tests/paintchips.rs index 13da431175..c64bcc7aba 100644 --- a/crates/ui-egui/src/tests/paintchips.rs +++ b/crates/ui-egui/src/tests/paintchips.rs @@ -313,7 +313,7 @@ fn the_popover_swatch_libraries_button_opens_the_libraries_menu() { let libraries = *popover_bottom_buttons(&ctx).first().expect("the popover has a bottom bar"); click(&mut app, &ctx, libraries.center(), Modifiers::NONE, control_bar); let shapes = frame(&mut app, &ctx, vec![], Modifiers::NONE, control_bar); - assert!(text_rect(&shapes, "Swatch Tiles").is_some(), "the popover stays open"); + assert_eq!(popover_bottom_buttons(&ctx).first(), Some(&libraries), "the popover stays open"); let defaults = menu_item_rect(&shapes, "Default Swatches").expect("the libraries menu is open"); assert!(menu_item_rect(&shapes, "Other Library…").is_some()); let earth = menu_item_rect(&shapes, "Earth Tones").expect("the menu lists the built-in libraries");