From 8f420f78cf263c3a5384ad575fdd5623d0242b2a Mon Sep 17 00:00:00 2001
From: Carlos Zamora <carlos.zamora@microsoft.com>
Date: Mon, 24 Jul 2023 15:34:55 -0700
Subject: [PATCH 1/2] Add UIA element grouping to SettingsContainer

---
 src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml b/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
index 5efeceeaece..006c1fef998 100644
--- a/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
+++ b/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
@@ -106,7 +106,8 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:SettingContainer">
-                    <Grid Style="{StaticResource NonExpanderGrid}">
+                    <Grid Style="{StaticResource NonExpanderGrid}"
+                          AutomationProperties.Name="{TemplateBinding Header}">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />

From 8fa718c3d2fe71ddb6d93c2b58f4251df5101ba5 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <carlos.zamora@microsoft.com>
Date: Tue, 25 Jul 2023 10:53:14 -0700
Subject: [PATCH 2/2] format

---
 .../TerminalSettingsEditor/SettingContainerStyle.xaml         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml b/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
index 006c1fef998..9803220c6b3 100644
--- a/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
+++ b/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
@@ -106,8 +106,8 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:SettingContainer">
-                    <Grid Style="{StaticResource NonExpanderGrid}"
-                          AutomationProperties.Name="{TemplateBinding Header}">
+                    <Grid AutomationProperties.Name="{TemplateBinding Header}"
+                          Style="{StaticResource NonExpanderGrid}">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />