From eb8a9bb8364fb97c36208cc50ea54da5e176dc86 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels9001@hotmail.com>
Date: Thu, 22 Jul 2021 13:49:17 +0200
Subject: [PATCH] Margin fixes

---
 .../Controls/SidePanel/SettingsPageControl.xaml           | 8 +++++---
 .../OOBE/Views/OobeAwake.xaml                             | 3 ++-
 .../OOBE/Views/OobeColorPicker.xaml                       | 3 ++-
 .../OOBE/Views/OobeFancyZones.xaml                        | 2 +-
 .../OOBE/Views/OobeFileExplorer.xaml                      | 2 +-
 .../OOBE/Views/OobeImageResizer.xaml                      | 2 +-
 .../OOBE/Views/OobeKBM.xaml                               | 2 +-
 .../OOBE/Views/OobePowerRename.xaml                       | 2 +-
 .../OOBE/Views/OobeRun.xaml                               | 2 +-
 .../OOBE/Views/OobeShellPage.xaml                         | 5 +++--
 .../OOBE/Views/OobeShortcutGuide.xaml                     | 2 +-
 .../OOBE/Views/OobeVideoConference.xaml                   | 2 +-
 .../Views/GeneralPage.xaml                                | 4 ++--
 .../Views/KeyboardManagerPage.xaml                        | 2 +-
 .../Views/PowerLauncherPage.xaml                          | 2 +-
 .../Views/ShortcutGuidePage.xaml                          | 1 +
 16 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SidePanel/SettingsPageControl.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SidePanel/SettingsPageControl.xaml
index 66e0c860b8..106ce9c1ee 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SidePanel/SettingsPageControl.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SidePanel/SettingsPageControl.xaml
@@ -34,7 +34,7 @@
                         <Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage" />
                         <Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage" />
                         <Setter Target="LinksPanel.Margin" Value="0,12,0,0" />
-                        <Setter Target="AboutImage.Margin" Value="-12,12,12,0" />
+                        <Setter Target="AboutImage.Margin" Value="0,12,12,0" />
                         <Setter Target="Header.Margin" Value="24,44,0,0" />
                     </VisualState.Setters>
                 </VisualState>
@@ -78,10 +78,12 @@
             <HyperlinkButton x:Name="AboutImage"
                          RelativePanel.Below="AboutDescription"
                          MaxWidth="240"
-                         CornerRadius="4"
+                         CornerRadius="8"
                          x:Uid="Learn_More_Description"
+                         Padding="0"
+                             Background="Red"
                          NavigateUri="{x:Bind ModuleImageLink}"
-                         Margin="-12, 12, 0, 12">
+                         Margin="0, 12, 0, 12">
                 <Image>
                     <Image.Source>
                         <BitmapImage UriSource="{x:Bind ModuleImageSource}" />
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeAwake.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeAwake.xaml
index 1f6c826341..3d486bcf08 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeAwake.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeAwake.xaml
@@ -30,7 +30,8 @@
                            Margin="0,4,0,0"
                            Text="{x:Bind ViewModel.Description}" />
 
-                <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Margin="0,0,0,4">
+                <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
+                                 Margin="-12,0,0,4">
                     <TextBlock>
                                 <Run x:Uid="Oobe_LearnMore" />
                                 <Run Text="{x:Bind ViewModel.ModuleName}" />
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeColorPicker.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeColorPicker.xaml
index 13445a38d1..008daedbc7 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeColorPicker.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeColorPicker.xaml
@@ -31,7 +31,8 @@
                            Margin="0,4,0,0"
                            Text="{x:Bind ViewModel.Description}" />
 
-                <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Margin="0,0,0,4">
+                <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
+                                 Margin="-12,0,0,4">
                     <TextBlock>
                                 <Run x:Uid="Oobe_LearnMore" />
                                 <Run Text="{x:Bind ViewModel.ModuleName}" />
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFancyZones.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFancyZones.xaml
index b52d43a5eb..1deb7dff3d 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFancyZones.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFancyZones.xaml
@@ -30,7 +30,7 @@
                            Text="{x:Bind ViewModel.Description}" />
 
                 <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
-                                 Margin="0,0,0,4">
+                                 Margin="-12,0,0,4">
                     <TextBlock>
                                 <Run x:Uid="Oobe_LearnMore" />
                                 <Run Text="{x:Bind ViewModel.ModuleName}" />
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFileExplorer.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFileExplorer.xaml
index e9a76ff4a8..3744f347ef 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFileExplorer.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFileExplorer.xaml
@@ -31,7 +31,7 @@
                            Text="{x:Bind ViewModel.Description}" />
 
                 <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
-                                 Margin="0,0,0,4">
+                                 Margin="-12,0,0,4">
                     <TextBlock>
                                 <Run x:Uid="Oobe_LearnMore" />
                                 <Run Text="{x:Bind ViewModel.ModuleName}" />
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeImageResizer.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeImageResizer.xaml
index fe2afcecd4..9591e2e96f 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeImageResizer.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeImageResizer.xaml
@@ -32,7 +32,7 @@
                            Text="{x:Bind ViewModel.Description}" />
 
                 <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
-                                 Margin="0,0,0,4">
+                                 Margin="-12,0,0,4">
                     <TextBlock>
                                 <Run x:Uid="Oobe_LearnMore" />
                                 <Run Text="{x:Bind ViewModel.ModuleName}" />
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeKBM.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeKBM.xaml
index 06fdec0125..97d2e9a1d3 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeKBM.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeKBM.xaml
@@ -31,7 +31,7 @@
                            Text="{x:Bind ViewModel.Description}" />
 
                 <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
-                                 Margin="0,0,0,4">
+                                 Margin="-12,0,0,4">
                     <TextBlock>
                                 <Run x:Uid="Oobe_LearnMore" />
                                 <Run Text="{x:Bind ViewModel.ModuleName}" />
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobePowerRename.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobePowerRename.xaml
index 44e24674a8..28d6bfb79c 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobePowerRename.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobePowerRename.xaml
@@ -31,7 +31,7 @@
                            Text="{x:Bind ViewModel.Description}" />
 
                 <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
-                                 Margin="0,0,0,4">
+                                 Margin="-12,0,0,4">
                     <TextBlock>
                                 <Run x:Uid="Oobe_LearnMore" />
                                 <Run Text="{x:Bind ViewModel.ModuleName}" />
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeRun.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeRun.xaml
index 29c07b73a4..a5e8beba9a 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeRun.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeRun.xaml
@@ -32,7 +32,7 @@
                            Text="{x:Bind ViewModel.Description}" />
 
                 <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
-                                 Margin="0,0,0,4">
+                                 Margin="-12,0,0,4">
                     <TextBlock>
                                 <Run x:Uid="Oobe_LearnMore" />
                                 <Run Text="{x:Bind ViewModel.ModuleName}" />
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml
index eb7c1bb039..7c3e42bf0e 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml
@@ -7,6 +7,7 @@
     xmlns:localModels="using:Microsoft.PowerToys.Settings.UI.OOBE.ViewModel"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    winui:BackdropMaterial.ApplyToRootOrPageBackground="True"
     mc:Ignorable="d"
     Loaded="UserControl_Loaded">
 
@@ -19,8 +20,8 @@
             </winui:NavigationViewItem>
         </DataTemplate>
     </UserControl.Resources>
-    
-    <Grid>
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <VisualStateManager.VisualStateGroups>
             <VisualStateGroup x:Name="LayoutVisualStates">
                 <VisualState x:Name="WideLayout">
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShortcutGuide.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShortcutGuide.xaml
index 09af798315..0f7328a555 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShortcutGuide.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShortcutGuide.xaml
@@ -32,7 +32,7 @@
                            Text="{x:Bind ViewModel.Description}" />
 
                 <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
-                                 Margin="0,0,0,4">
+                                 Margin="-12,0,0,4">
 
                     <TextBlock>
                                 <Run x:Uid="Oobe_LearnMore" />
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeVideoConference.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeVideoConference.xaml
index 0f340cb4f8..f84456cbfa 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeVideoConference.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeVideoConference.xaml
@@ -32,7 +32,7 @@
                            Text="{x:Bind ViewModel.Description}" />
 
                 <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
-                                 Margin="0,0,0,4">
+                                 Margin="-12,0,0,4">
                     <TextBlock>
                                 <Run x:Uid="Oobe_LearnMore" />
                                 <Run Text="{x:Bind ViewModel.ModuleName}" />
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
index f0c4323679..42534ed96e 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
@@ -51,7 +51,7 @@
                           IsEnabled="{Binding Mode=TwoWay, Path=IsElevated}"
                           IsOn="{Binding Mode=TwoWay, Path=RunElevated}"/>
 
-                <HyperlinkButton NavigateUri="https://aka.ms/powertoysDetectedElevatedHelp">
+                <HyperlinkButton NavigateUri="https://aka.ms/powertoysDetectedElevatedHelp" Margin="-12,0,0,0">
                     <TextBlock x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link" TextWrapping="Wrap" />
                 </HyperlinkButton>
 
@@ -73,7 +73,7 @@
 
                     <RadioButton x:Uid="Radio_Theme_Default"
                              IsChecked="{ Binding Mode=TwoWay, Path=IsSystemThemeRadioButtonChecked}"/>
-                    <HyperlinkButton Click="OpenColorsSettings_Click">
+                    <HyperlinkButton Click="OpenColorsSettings_Click" Margin="-12,0,0,0">
                         <TextBlock x:Uid="Windows_Color_Settings" />
                     </HyperlinkButton>
                 </StackPanel>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
index c47ef88ae5..53f798d83a 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
@@ -195,7 +195,7 @@
                 <ToggleSwitch x:Uid="KeyboardManager_EnableToggle"
                           IsOn="{x:Bind Path=ViewModel.Enabled, Mode=TwoWay}"/>
 
-                <HyperlinkButton NavigateUri="https://aka.ms/powerToysCannotRemapKeys" Margin="{StaticResource XSmallTopMargin}">
+                <HyperlinkButton NavigateUri="https://aka.ms/powerToysCannotRemapKeys" Margin="-12, 8, 0, 0">
                     <TextBlock x:Uid="KBM_KeysCannotBeRemapped" />
                 </HyperlinkButton>
 
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
index be4ee95f89..e25456e9fa 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
@@ -161,7 +161,7 @@
                 <RadioButton x:Uid="Radio_Theme_Default"
                              IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}"
                              IsChecked="{Binding Mode=TwoWay, Path=IsSystemThemeRadioButtonChecked}" />
-                <HyperlinkButton Click="OpenColorsSettings_Click"
+                <HyperlinkButton Click="OpenColorsSettings_Click" Margin="-12,0,0,0"
                                  IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}">
                     <TextBlock x:Uid="Windows_Color_Settings" />
                 </HyperlinkButton>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
index 268501980f..4a7fa12162 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
@@ -78,6 +78,7 @@
                     <RadioButton x:Uid="Radio_Theme_Default"/>
                 </muxc:RadioButtons>
                 <HyperlinkButton Click="OpenColorsSettings_Click"
+                                 Margin="-12,0,0,0"
                              IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
                     <TextBlock x:Uid="Windows_Color_Settings" />
                 </HyperlinkButton>