mirror of
https://github.com/storytold/figcraft.git
synced 2026-10-28 20:36:55 -06:00
BFlatandClaude Opus 5.5
c49a72ea88
* M8: accessibility: screen reader names, keyboard navigation mode
- Screen readers: the custom-painted controls report a role, name, value and
state to AccessKit (number and text fields, dropdowns, segmented and toggle
buttons, tools with their keys, layer rows as tree items, pages, tabs, menu
items, the canvas describing the selection), from the shared widget helpers
and a `Tip` trait for ad-hoc icon buttons. Regions are named containers.
- Keyboard navigation: F6 / Shift+F6 (view.nextRegion / view.previousRegion)
cycle the toolbar, layers, canvas and properties; Tab / Shift+Tab move within
a region and wrap; Enter or Space activate; arrows move along the toolbar and
through the layer rows; menus and flyouts opened from the keyboard take it and
give it back; Escape returns to the canvas. A focus ring (new `focus` token)
shows until the next pointer press. Tab on the canvas selects the next layer
again instead of moving egui's focus to the tab strip; Enter that starts a
field edit no longer ends it.
- Reduced motion: pref.reduceMotion and the system setting (Windows
UISettings, macOS, GNOME, prefers-reduced-motion) turn egui's animations off.
- Contrast: light secondary and accent text meet WCAG AA.
- ui.inspect reports focus {region, keyboard, control} and reduceMotion;
ui.set {focusRegion}.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* M8: parity report command count after merging main
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* M8: accessibility: regression test against nested egui context locks
A debug build's temporary logging called the context inside a context closure and hung; the shipped code never does. Document the rule in a11y.rs and run every accessibility path with the AccessKit tree on, so a nested call fails the test (debug builds panic after 10 s) instead of hanging.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
58 lines
2.6 KiB
Rust
58 lines
2.6 KiB
Rust
//! Accessibility keys and preferences: F6 / Shift+F6 move the keyboard between the window's regions
|
|
//! (the UI does the moving; the commands ask it to), live while editing text too, listed in the
|
|
//! shortcuts panel; Reduce motion is a preference.
|
|
|
|
use serde_json::json;
|
|
|
|
use crate::Session;
|
|
use crate::keymap::{Context, GESTURES, Group, KEYS, Mods, Platform, display, lookup};
|
|
|
|
#[test]
|
|
fn f6_and_shift_f6_cycle_the_regions_on_every_platform_and_while_editing_text() {
|
|
let shift = Mods { shift: true, ..Mods::default() };
|
|
for p in [Platform::Mac, Platform::Other] {
|
|
for c in [Context::Canvas, Context::Text] {
|
|
assert_eq!(lookup(p, c, "F6", Mods::default()).map(|b| b.id), Some("view.nextRegion"), "{p:?} {c:?}");
|
|
assert_eq!(lookup(p, c, "F6", shift).map(|b| b.id), Some("view.previousRegion"), "{p:?} {c:?}");
|
|
}
|
|
}
|
|
assert_eq!(display("F6", Platform::Other), "F6");
|
|
assert_eq!(display("Shift+F6", Platform::Mac), "⇧F6");
|
|
assert_eq!(display("Shift+F6", Platform::Other), "Shift+F6");
|
|
// Listed with the view keys, next to the keyboard-mode keys they lead to.
|
|
for id in ["view.nextRegion", "view.previousRegion"] {
|
|
let b = KEYS.iter().find(|b| b.id == id).unwrap();
|
|
assert_eq!(b.group, Group::View);
|
|
assert!(b.title().starts_with("Focus the"), "{}", b.title());
|
|
}
|
|
assert!(GESTURES.iter().any(|g| g.0 == Group::View && g.3.contains("Tab")));
|
|
}
|
|
|
|
#[test]
|
|
fn region_commands_ask_the_ui_to_move_the_keyboard() {
|
|
let mut s = Session::new();
|
|
for (cmd, step) in [("view.nextRegion", 1), ("view.previousRegion", -1)] {
|
|
s.ui_requests.clear();
|
|
s.execute(cmd, &json!({})).unwrap();
|
|
let r = s.ui_requests.iter().find(|r| r.kind == "focus.region").unwrap_or_else(|| panic!("{cmd}"));
|
|
assert_eq!(r.data["step"], step, "{cmd}");
|
|
// Nothing to undo: the document didn't change.
|
|
assert!(!s.ds().unwrap().is_dirty());
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn reduce_motion_is_a_preference_that_persists() {
|
|
let mut s = Session::new();
|
|
assert!(!s.prefs.reduce_motion);
|
|
assert_eq!(s.execute("pref.reduceMotion", &json!({})).unwrap()["on"], true);
|
|
assert!(s.prefs.reduce_motion);
|
|
assert_eq!(s.execute("pref.reduceMotion", &json!({"on": false})).unwrap()["on"], false);
|
|
s.prefs.reduce_motion = true;
|
|
// Saved with the other preferences; older settings files without it read as off.
|
|
let v = serde_json::to_value(&s.prefs).unwrap();
|
|
assert_eq!(v["reduce_motion"], true);
|
|
let old: crate::Prefs = serde_json::from_value(json!({"theme": "dark"})).unwrap();
|
|
assert!(!old.reduce_motion);
|
|
}
|