From 464e4bd3d1c25b90795b2b771d562454a61f4d77 Mon Sep 17 00:00:00 2001
From: nick5616 <nbelovoskey@microsoft.com>
Date: Mon, 4 Apr 2022 14:26:03 -0700
Subject: [PATCH] Create dedicated close button

---
 src/App/ConnectionPage.xaml            | 6 ++++++
 src/App/ConnectionPage.xaml.cs         | 4 ++++
 src/App/Resources/en-US/Resources.resw | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/src/App/ConnectionPage.xaml b/src/App/ConnectionPage.xaml
index 5be12b84..c4d88232 100644
--- 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
index 85d54d3c..224b2990 100644
--- 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/Resources/en-US/Resources.resw b/src/App/Resources/en-US/Resources.resw
index d8f9c9a6..e2bb387b 100644
--- 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>
\ No newline at end of file