Option to toggle the system tray icon (#23220)

* Added option to toggle the system tray icon

At the moment, this hides the icon making the settings window inaccessible without first modifying the general `settings.json` file.

* Use IPC messages to manage the tray icon settings

* Fix launching second window binds to active settings process

* Added context menu option to hide tray icon

* Added Exit PT button to settings ui NavigationView.PaneFooter

* Moved DllImports to NativeMethods.cs

* Sentence case titles

* Fix whitespace

* Re-add exit icon to NavView

* Re-added toggle switch to new UI

* Fix build

* Fix build after merge main

* Fix the string to display

* add shut down buttons

* finish polish

* fix string

* Styling tweaks to titlebar and settingscards

* fix comment

* fix unit test

* fix ut

---------

Co-authored-by: Jaime Bernardo <jaime@janeasystems.com>
Co-authored-by: vanzue <vanzue@outlook.com>
Co-authored-by: Kayla Cinnamon <cinnamon@microsoft.com>
Co-authored-by: Niels Laute <niels.laute@live.nl>

src/settings-ui/Settings.UI/SettingsXAML/App.xaml

@@ -39,6 +39,7 @@
 
             <tkconverters:StringFormatConverter x:Key="StringFormatConverter" />
             <tkconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
+            <x:Double x:Key="SettingsCardSpacing">2</x:Double>
 
             <!--  Overrides  -->
             <Thickness x:Key="InfoBarIconMargin">6,16,16,16</Thickness>

src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroup.xaml

@@ -10,7 +10,7 @@
                     <StackPanel
                         ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
                         Orientation="Vertical"
-                        Spacing="2" />
+                        Spacing="{StaticResource SettingsCardSpacing}" />
                 </ItemsPanelTemplate>
             </Setter.Value>
         </Setter>

src/settings-ui/Settings.UI/SettingsXAML/Flyout/LaunchPage.xaml.cs

@@ -176,7 +176,7 @@ namespace Microsoft.PowerToys.Settings.UI.Flyout
             });
         }
 
-        private void ReportBugBtn_Click(object sender, RoutedEventArgs e)
+        internal void ReportBugBtn_Click(object sender, RoutedEventArgs e)
         {
             ViewModel.StartBugReport();
 

src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml

@@ -266,6 +266,10 @@
                     <tkcontrols:SettingsCard x:Uid="GeneralPage_RunAtStartUp" IsEnabled="{x:Bind ViewModel.IsRunAtStartupGPOManaged, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                         <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.Startup, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
+
+                    <tkcontrols:SettingsCard x:Uid="ShowSystemTrayIcon">
+                        <ToggleSwitch x:Uid="ShowSystemTrayIcon_ToggleSwitch" IsOn="{x:Bind ViewModel.ShowSysTrayIcon, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
                     <InfoBar
                         x:Uid="GPO_SettingIsManaged"
                         BorderThickness="0"
@@ -402,10 +406,11 @@
                     </InfoBar>
                 </controls:SettingsGroup>
                 <controls:SettingsGroup x:Uid="General_DiagnosticsAndFeedback" Visibility="Visible">
-                    <StackPanel>
+                    <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
                         <HyperlinkButton
                             x:Uid="GeneralPage_DiagnosticsAndFeedback_Link"
-                            Margin="-8,0,0,0"
+                            Margin="0,0,0,8"
+                            Padding="0"
                             NavigateUri="https://aka.ms/powertoys-data-and-privacy-documentation" />
                         <tkcontrols:SettingsCard
                             x:Uid="GeneralPage_EnableDataDiagnostics"
@@ -449,7 +454,12 @@
                                 <Button x:Uid="GeneralPage_ViewDiagnosticDataViewerInfoButton" Click="Click_ViewDiagnosticDataViewerRestart" />
                             </InfoBar.ActionButton>
                         </InfoBar>
-
+                        <tkcontrols:SettingsCard x:Uid="GeneralPage_ReportBugPackage" HeaderIcon="{ui:FontIcon Glyph=&#xEBE8;}">
+                            <Button
+                                x:Uid="GeneralPageReportBugPackage"
+                                HorizontalAlignment="Right"
+                                Click="BugReportToolClicked" />
+                        </tkcontrols:SettingsCard>
                     </StackPanel>
                 </controls:SettingsGroup>
             </StackPanel>

src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml.cs

@@ -7,6 +7,7 @@ using System.Threading;
 using System.Threading.Tasks;
 
 using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Flyout;
 using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.ViewModels;
@@ -165,5 +166,24 @@ namespace Microsoft.PowerToys.Settings.UI.Views
         {
             await Task.Run(ViewModel.ViewDiagnosticData);
         }
+
+        private void ExitPTItem_Tapped(object sender, RoutedEventArgs e)
+        {
+            const string ptTrayIconWindowClass = "PToyTrayIconWindow"; // Defined in runner/tray_icon.h
+            const nuint ID_EXIT_MENU_COMMAND = 40001;                  // Generated resource from runner/runner.base.rc
+
+            // Exit the XAML application
+            Application.Current.Exit();
+
+            // Invoke the exit command from the tray icon
+            IntPtr hWnd = NativeMethods.FindWindow(ptTrayIconWindowClass, ptTrayIconWindowClass);
+            NativeMethods.SendMessage(hWnd, NativeMethods.WM_COMMAND, ID_EXIT_MENU_COMMAND, 0);
+        }
+
+        private void BugReportToolClicked(object sender, RoutedEventArgs e)
+        {
+            var launchPage = new LaunchPage();
+            launchPage.ReportBugBtn_Click(sender, e);
+        }
     }
 }

src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml

@@ -39,10 +39,17 @@
             Margin="48,0,0,0"
             VerticalAlignment="Top"
             IsHitTestVisible="True">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition x:Name="LeftTitleBarColumn" Width="*" />
+                <ColumnDefinition x:Name="RightTitleBarColumn" Width="Auto" />
+            </Grid.ColumnDefinitions>
             <animations:Implicit.Animations>
                 <animations:OffsetAnimation Duration="0:0:0.3" />
             </animations:Implicit.Animations>
-            <StackPanel Orientation="Horizontal">
+            <StackPanel
+                Grid.Column="0"
+                HorizontalAlignment="Left"
+                Orientation="Horizontal">
                 <Image
                     Width="16"
                     Height="16"
@@ -64,6 +71,24 @@
                     TextWrapping="NoWrap"
                     Visibility="Collapsed" />
             </StackPanel>
+            <StackPanel
+                Grid.Column="1"
+                Margin="0,0,148,0"
+                HorizontalAlignment="Right"
+                Orientation="Horizontal">
+                <Button
+                    x:Name="ShutDownBtn"
+                    Height="48"
+                    Click="ExitPTItem_Tapped"
+                    Style="{StaticResource SubtleButtonStyle}">
+                    <FontIcon FontSize="16" Glyph="&#xE7E8;" />
+                    <ToolTipService.ToolTip>
+                        <ToolTip>
+                            <TextBlock x:Uid="AppTitleBarShutDown_Tooltip" />
+                        </ToolTip>
+                    </ToolTipService.ToolTip>
+                </Button>
+            </StackPanel>
         </Grid>
         <NavigationView
             x:Name="navigationView"

src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml.cs

@@ -9,6 +9,7 @@ using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Services;
 using Microsoft.PowerToys.Settings.UI.ViewModels;
+using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Automation.Peers;
 using Microsoft.UI.Xaml.Controls;
@@ -422,6 +423,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                 // A custom title bar is required for full window theme and Mica support.
                 // https://docs.microsoft.com/windows/apps/develop/title-bar?tabs=winui3#full-customization
                 u.ExtendsContentIntoTitleBar = true;
+                u.AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Tall;
                 WindowHelpers.ForceTopBorder1PixelInsetOnWindows10(WindowNative.GetWindowHandle(u));
                 u.SetTitleBar(AppTitleBar);
                 var loader = ResourceLoaderInstance.ResourceLoader;
@@ -457,5 +459,18 @@ namespace Microsoft.PowerToys.Settings.UI.Views
         {
             navigationView.IsPaneOpen = !navigationView.IsPaneOpen;
         }
+
+        private void ExitPTItem_Tapped(object sender, RoutedEventArgs e)
+        {
+            const string ptTrayIconWindowClass = "PToyTrayIconWindow"; // Defined in runner/tray_icon.h
+            const nuint ID_EXIT_MENU_COMMAND = 40001;                  // Generated resource from runner/runner.base.rc
+
+            // Exit the XAML application
+            Application.Current.Exit();
+
+            // Invoke the exit command from the tray icon
+            IntPtr hWnd = NativeMethods.FindWindow(ptTrayIconWindowClass, ptTrayIconWindowClass);
+            NativeMethods.SendMessage(hWnd, NativeMethods.WM_COMMAND, ID_EXIT_MENU_COMMAND, 0);
+        }
     }
 }