mirror of
https://github.com/MaSzyna-EU07/StarterNG.git
synced 2026-11-19 06:55:59 +01:00
fix: a blind player can bind keys, build a consist and read the tapes
A review against WCAG 2.2 AA left places a screen reader user could not work: - Key bindings: a key's button says the command and the key, the clear button which command it clears; a new key is said aloud and focus comes back to its row. The on-screen keyboard is reached with Tab and walked with the arrows. - Number fields read their label; the spin buttons are named and left out of Tab. - Dialogs: Enter presses the main button, Esc closes, focus starts on the first button and the message is read with it. - Consist: every change is said - added, removed, turned, moved, replaced, undone - and the strip is a named list; a turned card says so. - Searches say how many entries are left once typing pauses. - Hasler tapes, the black box timeline, timetable and cab panel take focus, work from the keyboard, read their value as it changes and draw a focus frame. - Section reset and level controls, the crew button and the tabs carry names; English names from Avalonia's templates are read in the starter's language; sort and crew menus are radio items. - Input borders reach 3:1 against the panels; Tab starts at the top bar; the splash screen has a title and its progress reads the loading step.
This commit is contained in:
@@ -1,5 +1,8 @@
|
||||
using System;
|
||||
using Avalonia;
|
||||
using Avalonia.Automation;
|
||||
using Avalonia.Automation.Peers;
|
||||
using Avalonia.Automation.Provider;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Controls.Primitives;
|
||||
using Avalonia.Layout;
|
||||
@@ -235,10 +238,13 @@ internal static class UiKit
|
||||
BorderBrush = Palette.CardBorder;
|
||||
BorderThickness = new Thickness(0, 0, 0, 1);
|
||||
Child = _row;
|
||||
// Read as the tabs they are, which of them is picked.
|
||||
AutomationProperties.SetControlTypeOverride(_row, AutomationControlType.Tab);
|
||||
AutomationProperties.SetAccessibilityView(_row, AccessibilityView.Content);
|
||||
for (int i = 0; i < choices.Length; i++)
|
||||
{
|
||||
int index = i;
|
||||
var button = new Button
|
||||
var button = new SegmentButton
|
||||
{
|
||||
Content = choices[i],
|
||||
Padding = new Thickness(14, 3),
|
||||
@@ -267,8 +273,9 @@ internal static class UiKit
|
||||
_selected = value;
|
||||
for (int i = 0; i < _row.Children.Count; i++)
|
||||
{
|
||||
var button = (Button)_row.Children[i];
|
||||
var button = (SegmentButton)_row.Children[i];
|
||||
bool on = i == value;
|
||||
button.IsOn = on;
|
||||
var line = on ? Palette.Accent : Brushes.Transparent;
|
||||
button.Background = on ? Palette.Panel : Brushes.Transparent;
|
||||
button.BorderBrush = line;
|
||||
@@ -280,4 +287,51 @@ internal static class UiKit
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// A choice of <see cref="Segmented"/>: a button to look at, a tab to a screen reader,
|
||||
/// which says whether it is the one picked.
|
||||
/// </summary>
|
||||
private sealed class SegmentButton : Button
|
||||
{
|
||||
private bool _on;
|
||||
|
||||
protected override Type StyleKeyOverride => typeof(Button);
|
||||
|
||||
public bool IsOn
|
||||
{
|
||||
get => _on;
|
||||
set
|
||||
{
|
||||
if (_on == value)
|
||||
return;
|
||||
_on = value;
|
||||
(ControlAutomationPeer.FromElement(this) as Peer)?.Told(!value, value);
|
||||
}
|
||||
}
|
||||
|
||||
public void Pick() => OnClick();
|
||||
|
||||
protected override AutomationPeer OnCreateAutomationPeer() => new Peer(this);
|
||||
|
||||
private sealed class Peer(SegmentButton owner) : ButtonAutomationPeer(owner), ISelectionItemProvider
|
||||
{
|
||||
public void Told(bool before, bool now) =>
|
||||
RaisePropertyChangedEvent(SelectionItemPatternIdentifiers.IsSelectedProperty, before, now);
|
||||
|
||||
protected override AutomationControlType GetAutomationControlTypeCore() => AutomationControlType.TabItem;
|
||||
|
||||
public bool IsSelected => owner.IsOn;
|
||||
|
||||
public ISelectionProvider? SelectionContainer => null;
|
||||
|
||||
public void Select() => owner.Pick();
|
||||
|
||||
public void AddToSelection() => owner.Pick();
|
||||
|
||||
public void RemoveFromSelection()
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user