Merge pull request #200 from nick5616/accessibilityFixes1

Accessibility Fixes
microsoft · Apr 4, 2022 · c3a09af · c3a09af
2 parents a401e14 + 464e4bd
commit c3a09af
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/src/App/ConnectionPage.xaml b/src/App/ConnectionPage.xaml
@@ -43,6 +43,12 @@
                     <StackPanel>
                         <TextBlock TextWrapping="Wrap" x:Uid="ExitText" Style="{ThemeResource FlyoutPickerTitleTextBlockStyle}"/>
                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                            <Button x:Name="Close" Padding="5" Margin="5" Click="Close_Click">
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                    <SymbolIcon Symbol="Back"/>
+                                    <TextBlock  Padding="5,0" TextWrapping="Wrap" x:Uid="Close"/>
+                                </StackPanel>
+                            </Button>
                             <Button x:Name="ConfirmExit" Padding="5" Margin="5" Click="ConfirmExit_Click">
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                     <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE711;"/>

diff --git a/src/App/ConnectionPage.xaml.cs b/src/App/ConnectionPage.xaml.cs
@@ -265,6 +265,10 @@ private void ConfirmExit_Click(object sender, RoutedEventArgs e)
         private void Exit_Click(object sender, RoutedEventArgs e)
         {
             AutomationProperties.SetName(ConfirmExit, "ConfirmExit");
+        }
+        private void Close_Click(object sender, RoutedEventArgs e)
+        {
+            ExitFlyout.Hide();
         }
 
         private async void ValidateXMLButton_Click(object sender, RoutedEventArgs e)

diff --git a/src/App/MainPage.xaml b/src/App/MainPage.xaml
@@ -65,7 +65,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
-                    <TextBlock x:Name="Header" x:Uid="FactoryOrchestrator" Text="" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Column="0" FontWeight="Bold" Style="{StaticResource TitleTextBlockStyle}"/>
+                    <TextBlock x:Name="Header" x:Uid="FactoryOrchestrator" Text="" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Column="0" FontWeight="Bold" Style="{StaticResource TitleTextBlockStyle}" AutomationProperties.HeadingLevel="Level1"/>
                     <StackPanel x:Name="IndicatorPanel" Orientation="Horizontal" Background="{ThemeResource ControlAltFillColorTransparent}" HorizontalAlignment="Right" CornerRadius="5" Padding="1" Grid.Row="0" Grid.Column="1">
                         <StackPanel x:Name="ButtonPanel" Orientation="Horizontal" HorizontalAlignment="Right">
                             <Button x:Name="SystemButton" Background="{ThemeResource ControlFillColorSecondary}" x:Uid="SystemButton" Visibility="Visible" Padding="5" Margin="0">

diff --git a/src/App/Resources/en-US/Resources.resw b/src/App/Resources/en-US/Resources.resw
@@ -849,4 +849,7 @@ On retry</value>
   <data name="SystemHeader.Text" xml:space="preserve">
     <value>System Information</value>
   </data>
+  <data name="Close.Text" xml:space="preserve">
+    <value>Close</value>
+  </data>
 </root>