From cfdd8e27c043be1d3f541b00d781945133bcdf9e Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Mon, 16 Nov 2026 01:11:46 -0800 Subject: [PATCH] Swatches: test the chip popover's list without headings too The Fill/Stroke chip popovers on the Control bar and in Properties show the Swatches panel's body, so they also lose the Recent Colors and Swatch Tiles headings and the divider. The new test now runs on the popover as well as the panel, and checks that the first swatch tile is inside the "Swatch Tiles" list node. The popover libraries test finds the open popover by that list node instead of by the bottom bar's position. --- crates/ui-egui/src/panels.rs | 6 +-- crates/ui-egui/src/panels/swatches/tests.rs | 57 ++++++++++++--------- crates/ui-egui/src/tests/paintchips.rs | 11 +++- 3 files changed, 46 insertions(+), 28 deletions(-) diff --git a/crates/ui-egui/src/panels.rs b/crates/ui-egui/src/panels.rs index e5c7077900..aa07b13a90 100644 --- a/crates/ui-egui/src/panels.rs +++ b/crates/ui-egui/src/panels.rs @@ -618,11 +618,11 @@ pub(crate) fn label_or_name(s: &str, built_in: bool) -> &str { crate::i18n::label_or_name(crate::i18n::current(), s, built_in) } -/// Rows of chips (the Session's recent colours, which every paint command feeds), wrapped onto as +/// Rows of chips (the Session's recent colors, 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. +/// 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, heading: bool) -> Option { let t = Tokens::get(ui.ctx()); if heading { diff --git a/crates/ui-egui/src/panels/swatches/tests.rs b/crates/ui-egui/src/panels/swatches/tests.rs index b2780ff197..378b215f3e 100644 --- a/crates/ui-egui/src/panels/swatches/tests.rs +++ b/crates/ui-egui/src/panels/swatches/tests.rs @@ -1006,10 +1006,11 @@ 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. +/// The panel, and the Fill/Stroke chip popover that shows the same body, draw 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 find both parts by those names, with the chips in the +/// Recent Colors group and the tiles in the Swatch Tiles list. #[test] fn the_list_sits_under_the_recent_colors_row_without_headings() { fn texts(shapes: &[egui::Shape], out: &mut Vec) { @@ -1023,14 +1024,14 @@ fn the_list_sits_under_the_recent_colors_row_without_headings() { } // 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| { + let look = |app: &mut VectorcraftApp, draw: fn(&mut VectorcraftApp, &mut Ui), salt: &'static str| { 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)); + let mut out = ctx.run_ui(egui::RawInput { time: Some(time), screen_rect, ..Default::default() }, |ui| draw(app, ui)); out.textures_delta.clear(); last = Some(out); } @@ -1040,9 +1041,17 @@ fn the_list_sits_under_the_recent_colors_row_without_headings() { 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"); + // The list is the node that holds the tiles, not an empty node beside them: the first + // tile's node is inside it. + let (list, node) = nodes.iter().find(|(_, n)| n.label() == Some("Swatch Tiles")).expect("screen readers find the swatch list"); + assert_eq!(node.role(), egui::accesskit::Role::List); + let first = entries(app, Kind::All, "").first().map(|e| tiles::tile_id(salt, e).accesskit_id()).expect("the document has swatches"); + let (mut inside, mut stack) = (false, vec![*list]); + while let Some(id) = stack.pop() { + inside |= id == first; + stack.extend(nodes.iter().filter(|(n, _)| *n == id).flat_map(|(_, n)| n.children().iter().copied())); + } + assert!(inside, "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 { @@ -1050,23 +1059,25 @@ fn the_list_sits_under_the_recent_colors_row_without_headings() { } (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(); + for (draw, salt) in [(show as fn(&mut VectorcraftApp, &mut Ui), TILE), (popover, POPOVER_TILE)] { + 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, draw, salt); + assert!(!shown.iter().any(|t| t == "Recent Colors" || t == "Swatch Tiles"), "{salt}: 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, "{salt}: the row sits under the proxy row: {row_top}"); + assert!(top > row_bottom && top - row_bottom < 12.0, "{salt}: the list sits under the row: {row_bottom} {top}"); } - 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"); + app.ui.swatches_show_recent_colors = false; + let (_, recent, list) = look(&mut app, draw, salt); + assert_eq!(recent, None, "{salt}: Show Recent Colors unchecked hides the 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}"); + assert!(top < 50.0, "{salt}: the list starts under the proxy row: {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 diff --git a/crates/ui-egui/src/tests/paintchips.rs b/crates/ui-egui/src/tests/paintchips.rs index c64bcc7aba..bb3077317a 100644 --- a/crates/ui-egui/src/tests/paintchips.rs +++ b/crates/ui-egui/src/tests/paintchips.rs @@ -312,8 +312,15 @@ fn the_popover_swatch_libraries_button_opens_the_libraries_menu() { click(&mut app, &ctx, fill.center(), Modifiers::NONE, control_bar); 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_eq!(popover_bottom_buttons(&ctx).first(), Some(&libraries), "the popover stays open"); + // The popover's swatch list has no visible heading; screen readers find it as "Swatch Tiles". + ctx.enable_accesskit(); + let screen_rect = Some(Rect::from_min_size(Pos2::ZERO, vec2(1400.0, 1000.0))); + let mut out = ctx.run_ui(egui::RawInput { screen_rect, ..Default::default() }, |ui| control_bar(&mut app, ui)); + out.textures_delta.clear(); + let nodes = out.platform_output.accesskit_update.map(|u| u.nodes).unwrap_or_default(); + let list = nodes.iter().any(|(_, n)| n.label() == Some("Swatch Tiles") && n.role() == egui::accesskit::Role::List); + assert!(list, "the popover stays open"); + let shapes: Vec = out.shapes.into_iter().map(|c| c.shape).collect(); 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");