From 4c62cdeefa9395581ed8eb9a91302f4f2b1fdd18 Mon Sep 17 00:00:00 2001 From: bflatastic Date: Fri, 30 Oct 2026 12:04:32 +0700 Subject: [PATCH] Fix #1339 checks after merging main - ui_accessibility_audit: main's new Character panel controls (stroke width presets, line join, stroke order) raise Character:default to 46 findings (22 unnamed); the ratchet entry follows, since that panel is not yet audited. The control filter is written as clippy's nonminimal_bool asks. - ui_timeline_shapes (main's #2513 test): this PR names the Properties panel's Position row, so "Position" is no longer unique; the test takes the Animate menu's new entry. Co-Authored-By: Claude Opus 5.5 --- crates/ui-egui/tests/it/ui_timeline_shapes.rs | 4 +++- crates/ui-egui/tests/ui_accessibility_audit.rs | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/crates/ui-egui/tests/it/ui_timeline_shapes.rs b/crates/ui-egui/tests/it/ui_timeline_shapes.rs index 2f05e1b99..c98b4af19 100644 --- a/crates/ui-egui/tests/it/ui_timeline_shapes.rs +++ b/crates/ui-egui/tests/it/ui_timeline_shapes.rs @@ -503,8 +503,10 @@ fn text_animate_menu_adds_an_animator_with_the_property() { let mut h = harness(s); h.state_mut().ui.timeline.open_groups.insert(text); open_layer(&mut h, l); + // The Properties panel's Position row has the same accessible name: take the menu's new entry. + let shown: Vec<_> = h.query_all_by_label("Position").map(|n| n.rect()).collect(); click(&mut h, &format!("timeline.group.{text}.animate")); - let entry = h.get_by_label("Position").rect(); + let entry = h.query_all_by_label("Position").map(|n| n.rect()).find(|r| !shown.contains(r)).expect("the Animate menu's Position entry"); click_at(&mut h, entry.center()); let animators = |h: &Harness<'_, EffectcraftApp>| { h.state().session.active_comp().unwrap().layer(LayerId(l)).unwrap().props.sub("text").unwrap().sub("animators").cloned() diff --git a/crates/ui-egui/tests/ui_accessibility_audit.rs b/crates/ui-egui/tests/ui_accessibility_audit.rs index c9444bf9f..8f2f9cc4b 100644 --- a/crates/ui-egui/tests/ui_accessibility_audit.rs +++ b/crates/ui-egui/tests/ui_accessibility_audit.rs @@ -44,7 +44,7 @@ const BASELINE: &[(&str, usize, usize)] = &[ ("Timeline:default", 89, 42), ("Audio:default", 4, 2), ("Properties:default", 31, 15), - ("Character:default", 42, 21), + ("Character:default", 46, 22), ("Paragraph:default", 26, 13), ("Align:default", 12, 0), ("Tracker:default", 11, 3), @@ -186,7 +186,7 @@ fn audit(h: &Harness<'_, EffectcraftApp>, scenario: &str, scope: Rect, since: Op let role = a.role(); let actionable = a.data().supports_action(Action::Click) || a.data().supports_action(Action::Focus); let control = CONTROL_ROLES.contains(&role); - if !control && !(actionable && matches!(role, Role::Unknown | Role::GenericContainer)) { + if !(control || (actionable && matches!(role, Role::Unknown | Role::GenericContainer))) { continue; } let name = a.label().unwrap_or_default();