From 5aa58bf9220a190ca983de516cf74506317b939e Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 15 May 2023 18:22:10 +0200
Subject: [PATCH] [Settings]Peek settings UX consistency (#26012)

---
 .../Settings.UI/Strings/en-us/Resources.resw    |  3 +++
 src/settings-ui/Settings.UI/Views/PeekPage.xaml | 17 +++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
index a73fdf9c98..cd108c8738 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -2428,6 +2428,9 @@ From there, simply click on one of the supported files in the File Explorer and
   <data name="AlwaysOnTop_Activation_GroupSettings.Header" xml:space="preserve">
     <value>Activation</value>
   </data>
+  <data name="Peek_Activation_GroupSettings.Header" xml:space="preserve">
+    <value>Activation</value>
+  </data>
   <data name="AlwaysOnTop_EnableToggleControl_HeaderText.Header" xml:space="preserve">
     <value>Enable Always On Top</value>
     <comment>"Always On Top" is the name of the utility</comment>
diff --git a/src/settings-ui/Settings.UI/Views/PeekPage.xaml b/src/settings-ui/Settings.UI/Views/PeekPage.xaml
index 58a82bda65..7ba5a78af9 100644
--- a/src/settings-ui/Settings.UI/Views/PeekPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/PeekPage.xaml
@@ -14,9 +14,10 @@
     <controls:SettingsPageControl x:Uid="Peek" ModuleImageSource="ms-appx:///Assets/Modules/Peek.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel Orientation="Vertical">
-                <labs:SettingsCard x:Uid="Peek_EnablePeek" 
-                                   HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsPeek.png}"
-                                   IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                <labs:SettingsCard
+                    x:Uid="Peek_EnablePeek"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsPeek.png}"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
                     <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                 </labs:SettingsCard>
                 <InfoBar
@@ -26,11 +27,11 @@
                     IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
                     Severity="Informational" />
 
-                <labs:SettingsCard x:Uid="Shortcut" 
-                                   IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
-                                   HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEDA7;}">
-                    <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.ActivationShortcut, Mode=TwoWay}" />
-                </labs:SettingsCard>
+                <controls:SettingsGroup x:Uid="Peek_Activation_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsCard x:Uid="Activation_Shortcut" HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEDA7;}">
+                        <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.ActivationShortcut, Mode=TwoWay}" />
+                    </labs:SettingsCard>
+                </controls:SettingsGroup>
             </StackPanel>
         </controls:SettingsPageControl.ModuleContent>
     </controls:SettingsPageControl>