From 7974a9f43bffef706d07975045cb6bb927eeb168 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 29 Nov 2021 12:59:38 +0100
Subject: [PATCH] [Settings] Various bugfixes (#14611)

* Set maxwidth

* Correct shortcut

* Update GeneralPage.xaml
---
 .../Controls/Setting/Setting.xaml                     |  2 +-
 .../OOBE/Views/OobeShortcutGuide.xaml                 |  1 -
 .../OOBE/Views/OobeShortcutGuide.xaml.cs              | 11 ++++++++++-
 .../Strings/en-us/Resources.resw                      |  4 ++--
 .../Views/GeneralPage.xaml                            |  8 +++++++-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/Setting/Setting.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/Setting/Setting.xaml
index 6cf6e60b8e..17b61e8a6f 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/Setting/Setting.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/Setting/Setting.xaml
@@ -52,7 +52,7 @@
                           HorizontalAlignment="Center"
                           FontSize="20"
                           Margin="2,0,18,0"
-                          MaxWidth="26"
+                          MaxWidth="20"
                           AutomationProperties.AccessibilityView="Raw"
                           FontFamily="{ThemeResource SymbolThemeFontFamily}"
                           Foreground="{ThemeResource CardPrimaryForegroundBrush}"
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 ff90e31d1e..4e57891f0c 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
@@ -18,7 +18,6 @@
                            Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_ShortcutGuide_HowToLaunch" />
-
                 <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
                     <Button x:Uid="Launch_ShortcutGuide" Style="{StaticResource AccentButtonStyle}" Click="Start_ShortcutGuide_Click"/>
                     <Button x:Uid="OOBE_Settings"
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShortcutGuide.xaml.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShortcutGuide.xaml.cs
index d7048a7f50..d3e6aeee4d 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShortcutGuide.xaml.cs
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShortcutGuide.xaml.cs
@@ -2,6 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
@@ -55,8 +56,16 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             ViewModel.LogOpeningModuleEvent();
+            var settingsProperties = SettingsRepository<ShortcutGuideSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties;
 
-            HotkeyControl.Keys = SettingsRepository<ShortcutGuideSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.OpenShortcutGuide.GetKeysList();
+            if ((bool)settingsProperties.UseLegacyPressWinKeyBehavior.Value)
+            {
+                HotkeyControl.Keys = new List<object> { 92 };
+            }
+            else
+            {
+                HotkeyControl.Keys = settingsProperties.OpenShortcutGuide.GetKeysList();
+            }
         }
 
         protected override void OnNavigatedFrom(NavigationEventArgs e)
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
index 39840bfc97..9e52d1d9b7 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -1481,10 +1481,10 @@ From there, simply click on a Markdown file, PDF file or SVG icon in the File Ex
     <value>Awake is a Windows tool designed to keep your PC awake on-demand without having to manage its power settings. This behavior can be helpful when running time-consuming tasks while ensuring that your PC does not go to sleep or turn off its screens.</value>
   </data>
   <data name="Oobe_Awake_HowToUse.Text" xml:space="preserve">
-    <value>Open {PowerToys Settings} and enable Awake</value>
+    <value>Open **PowerToys Settings** and enable Awake</value>
   </data>
   <data name="Oobe_Awake_TipsAndTricks.Text" xml:space="preserve">
-    <value>You can always change modes quickly by {right-clicking the Awake icon} in the system tray.</value>
+    <value>You can always change modes quickly by **right-clicking the Awake icon** in the system tray.</value>
   </data>
   <data name="General_FailedToDownloadTheNewVersion.Title" xml:space="preserve">
     <value>An error occurred trying to install this update:</value>
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 42a6a90bff..e1c1235003 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
@@ -188,6 +188,7 @@
                                 <controls:Setting x:Uid="GeneralSettings_AlwaysRunAsAdminText" IsEnabled="{Binding Mode=OneWay, Path=IsElevated}" Style="{StaticResource ExpanderContentSettingStyle}">
                                     <controls:Setting.Description>
                                         <HyperlinkButton NavigateUri="https://aka.ms/powertoysDetectedElevatedHelp"
+                                                         Visibility="{Binding Mode=OneWay, Path=IsElevated}"
                                                          x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link"/>
                                     </controls:Setting.Description>
                                     <controls:Setting.ActionContent>
@@ -198,7 +199,12 @@
                                           Severity="Warning"
                                           IsTabStop="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource NegationConverter}}"
                                           IsClosable="False"
-                                          IsOpen="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource NegationConverter}}"/>
+                                          IsOpen="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource NegationConverter}}">
+                                    <muxc:InfoBar.ActionButton>
+                                        <HyperlinkButton NavigateUri="https://aka.ms/powertoysDetectedElevatedHelp"
+                                                         x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link"/>
+                                    </muxc:InfoBar.ActionButton>
+                                </muxc:InfoBar>
                             </StackPanel>
                         </controls:SettingExpander.Content>
                     </controls:SettingExpander>