From 102f42928c370013bc96e994e4e79495415cc8a5 Mon Sep 17 00:00:00 2001
From: stefansjfw <57057282+stefansjfw@users.noreply.github.com>
Date: Thu, 12 Nov 2020 10:08:17 +0100
Subject: [PATCH] [FancyZones Editor][Accessibility] Default focused elements
 in all FancyZones Editor windows (#7971)

* Default focused elements

* Fix focus when starting editor from settings
---
 .../editor/FancyZonesEditor/CanvasEditorWindow.xaml    |  2 +-
 .../editor/FancyZonesEditor/GridEditorWindow.xaml      |  2 +-
 .../editor/FancyZonesEditor/GridEditorWindow.xaml.cs   | 10 ++++++++++
 .../fancyzones/editor/FancyZonesEditor/MainWindow.xaml |  4 ++--
 .../editor/FancyZonesEditor/MainWindow.xaml.cs         |  6 ++++++
 src/modules/fancyzones/lib/FancyZones.cpp              |  2 +-
 6 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml
index 2a4fd83c83..3650a644f6 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml
@@ -176,7 +176,7 @@
         </Style>
 
     </Window.Resources>
-    <StackPanel>
+    <StackPanel FocusManager.FocusedElement="{Binding ElementName=newZoneButton}">
         <TextBlock Name="windowEditorDialogTitle" Text="{x:Static props:Resources.Custom_Layout_Creator}" Style="{StaticResource titleText}"  />
         <Button x:Name="newZoneButton" AutomationProperties.LabeledBy="{Binding ElementName=newZoneName}" Width="496" Height="136" Style="{StaticResource newZoneButton}" Click="OnAddZone">
             <StackPanel>
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml
index 3199fa9c9c..4699192a39 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml
@@ -179,7 +179,7 @@
 
         <TextBlock Text="{x:Static props:Resources.Note_Custom_Table}" Style="{StaticResource textLabel}" TextWrapping="Wrap" />
         <TextBlock x:Name="customLayoutName" Text="{x:Static props:Resources.Name}" Style="{StaticResource textLabel}" />
-        <TextBox Text="{Binding Name}" AutomationProperties.LabeledBy="{Binding ElementName=customLayoutName}" Style="{StaticResource textBox}" />
+        <TextBox Name="customLayoutNameTextBox" Text="{Binding Name}" GotFocus="NameTextBox_GotFocus" AutomationProperties.LabeledBy="{Binding ElementName=customLayoutName}" Style="{StaticResource textBox}" />
 <!--        
         <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
             <CheckBox x:Name="showGridSetting" VerticalAlignment="Center" HorizontalAlignment="Center" IsChecked="True" Margin="21,4,0,0"/>
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml.cs b/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml.cs
index 3f9b43af11..fe66febc90 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml.cs
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml.cs
@@ -38,5 +38,15 @@ namespace FancyZonesEditor
         }
 
         private GridLayoutModel _stashedModel;
+
+        private void NameTextBox_GotFocus(object sender, RoutedEventArgs e)
+        {
+            customLayoutNameTextBox.CaretIndex = customLayoutNameTextBox.Text.Length;
+        }
+
+        public System.Windows.Controls.TextBox NameTextBox()
+        {
+            return customLayoutNameTextBox;
+        }
     }
 }
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
index bbf8ce879d..5f826aa7fd 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
@@ -187,8 +187,8 @@
             </ControlTemplate.Triggers>
         </ControlTemplate>
     </Window.Resources>
-    
-    <StackPanel>
+
+    <StackPanel FocusManager.FocusedElement="{Binding ElementName=decrementZones}">
 
         <TextBlock Name="DialogTitle" Text="{x:Static props:Resources.Choose_Layout}" Style="{StaticResource titleText}" />
 
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
index f721f61766..7a98f7fe21 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
@@ -154,9 +154,11 @@ namespace FancyZonesEditor
             mainEditor.Edit();
 
             EditorWindow window;
+            bool isGrid = false;
             if (model is GridLayoutModel)
             {
                 window = new GridEditorWindow();
+                isGrid = true;
             }
             else
             {
@@ -166,6 +168,10 @@ namespace FancyZonesEditor
             window.Owner = EditorOverlay.Current;
             window.DataContext = model;
             window.Show();
+            if (isGrid)
+            {
+                (window as GridEditorWindow).NameTextBox().Focus();
+            }
         }
 
         private void Apply_Click(object sender, RoutedEventArgs e)
diff --git a/src/modules/fancyzones/lib/FancyZones.cpp b/src/modules/fancyzones/lib/FancyZones.cpp
index 770d61dbb7..1b6632c232 100644
--- a/src/modules/fancyzones/lib/FancyZones.cpp
+++ b/src/modules/fancyzones/lib/FancyZones.cpp
@@ -724,7 +724,7 @@ void FancyZones::ToggleEditor() noexcept
     sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI };
     sei.lpFile = NonLocalizable::FZEditorExecutablePath;
     sei.lpParameters = params.c_str();
-    sei.nShow = SW_SHOWNORMAL;
+    sei.nShow = SW_SHOWDEFAULT;
     ShellExecuteEx(&sei);
     Trace::FancyZones::EditorLaunched(1);