Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-05 10:46:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FZEditor]Mark headings for accessibility (#25897)

Browse Source 
* [FancyZones Editor - Edit layout] New HeadingTextBlock style is added and applied to FZ headers.

* [FancyZones Editor - Edit layout] Loaded event added.

* [Fancy zones editor - Edit layout] Two texts in FZEditor changed to header.

* [FancyZones Editor - Edit layout] Heading level property added for new headingtextblock.
This commit is contained in:
gokcekantarci
2023-05-12 11:15:04 +03:00
committed by GitHub
parent 50984fcd47
commit 912061d100
4 changed files with 62 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/fancyzones/editor/FancyZonesEditor/App.xaml
View File

@@ -14,6 +14,8 @@
<ResourceDictionary Source="pack://application:,,,/Styles/GridViewStyles.xaml" />
<ResourceDictionary Source="pack://application:,,,/Styles/LayoutPreviewStyles.xaml" />
</ResourceDictionary.MergedDictionaries>
<Style x:Key="HeadingTextBlock" TargetType="TextBlock"/>
</ResourceDictionary>
</Application.Resources>
</Application>

31
src/modules/fancyzones/editor/FancyZonesEditor/HeadingTextBlock.cs Normal file
View File

@@ -0,0 +1,31 @@
// Copyright (c) Microsoft Corporation
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Windows;
using System.Windows.Automation.Peers;
using System.Windows.Controls;
namespace FancyZonesEditor
{
public class HeadingTextBlock : TextBlock
{
protected override AutomationPeer OnCreateAutomationPeer()
{
return new HeadingTextBlockAutomationPeer(this);
}
internal sealed class HeadingTextBlockAutomationPeer : TextBlockAutomationPeer
{
public HeadingTextBlockAutomationPeer(HeadingTextBlock owner)
: base(owner)
{
}
protected override AutomationControlType GetAutomationControlTypeCore()
{
return AutomationControlType.Header;
}
}
}
}

42
src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
View File

@@ -188,11 +188,12 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock Text="{x:Static props:Resources.Templates}"
x:Name="TemplatesHeaderBlock"
FontWeight="SemiBold"
FontSize="24" />
<local:HeadingTextBlock Text="{x:Static props:Resources.Templates}"
AutomationProperties.HeadingLevel="Level1"
x:Name="TemplatesHeaderBlock"
FontWeight="SemiBold"
FontSize="24" />
<ui:GridView ItemsSource="{Binding TemplateModels}"
Grid.Row="1"
@@ -215,7 +216,8 @@
</ui:GridView.ItemContainerStyle>
</ui:GridView>
<TextBlock Text="{x:Static props:Resources.Custom}"
<local:HeadingTextBlock Text="{x:Static props:Resources.Custom}"
AutomationProperties.HeadingLevel="Level1"
x:Name="CustomHeaderBlock"
FontWeight="SemiBold"
Grid.Row="2"
@@ -362,7 +364,13 @@
Opened="Dialog_Opened"
Closed="Dialog_Closed">
<ui:ContentDialog.Title>
<TextBlock x:Name="EditLayoutDialogTitle" MaxWidth="320" Margin="0,0,96,0" Loaded="EditLayoutDialogTitle_Loaded"/>
<local:HeadingTextBlock
x:Name="EditLayoutDialogTitle"
MaxWidth="320"
Margin="0,0,96,0"
Style="{StaticResource HeadingTextBlock}"
Loaded="EditLayoutDialogTitle_Loaded"
AutomationProperties.HeadingLevel="Level1"/>
</ui:ContentDialog.Title>
<Grid DataContext="{Binding SelectedModel}"
Margin="4,4,24,32">
@@ -739,11 +747,17 @@
PrimaryButtonText="{x:Static props:Resources.Create}"
PrimaryButtonClick="NewLayoutDialog_PrimaryButtonClick"
IsPrimaryButtonEnabled="{Binding ElementName=LayoutNameText, Path=Text.Length}"
Title="{x:Static props:Resources.Choose_layout_type}"
Opened="Dialog_Opened"
Closed="Dialog_Closed">
<ui:ContentDialog.TitleTemplate>
<DataTemplate>
<local:HeadingTextBlock Text="{x:Static props:Resources.Choose_layout_type}"
AutomationProperties.HeadingLevel="Level1"
Style="{StaticResource HeadingTextBlock}" />
</DataTemplate>
</ui:ContentDialog.TitleTemplate>
<StackPanel Margin="0,16,24,0">
<TextBlock x:Name="NameHeaderText"
<TextBlock x:Name="NameHeaderText"
Text="{x:Static props:Resources.Name}" />
<TextBox Margin="3,6,3,0"
x:Name="LayoutNameText"
@@ -815,11 +829,11 @@
Margin="0,4,0,0"
Text="{x:Static props:Resources.Layout_Canvas_Description}"
Foreground="{DynamicResource SecondaryForegroundBrush}" />
</StackPanel>
</Grid>
</RadioButton.Content>
</RadioButton>
</StackPanel>
</StackPanel>
</Grid>
</RadioButton.Content>
</RadioButton>
</StackPanel>
</ui:ContentDialog>
</Grid>
</Window>

2
src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
View File

@@ -621,7 +621,7 @@ namespace FancyZonesEditor
SettingsDeepLink.OpenSettings(SettingsDeepLink.SettingsWindow.FancyZones);
}
private void EditLayoutDialogTitle_Loaded(object sender, EventArgs e)
private void EditLayoutDialogTitle_Loaded(object sender, RoutedEventArgs e)
{
EditLayoutDialogTitle.TextTrimming = TextTrimming.CharacterEllipsis;
EditLayoutDialogTitle.TextWrapping = TextWrapping.NoWrap;