From c4a0364d57e571f244ee33c66d56709da2dbacf2 Mon Sep 17 00:00:00 2001
From: Laute <Niels.Laute@philips.com>
Date: Sat, 20 Nov 2021 16:16:08 +0100
Subject: [PATCH] Updates to titlebar

---
 .../MainWindow.xaml                                    | 10 ++++------
 .../MainWindow.xaml.cs                                 |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI.WinUI3/MainWindow.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI.WinUI3/MainWindow.xaml
index 245c09941..e89cfdd6b 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI.WinUI3/MainWindow.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI.WinUI3/MainWindow.xaml
@@ -12,12 +12,10 @@
             <RowDefinition Height="36"/>
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <Grid x:Name="CustomTitleBar" HorizontalAlignment="Stretch">
-            <StackPanel Orientation="Horizontal" Grid.ColumnSpan="2" VerticalAlignment="Top" Margin="16,8,8,8">
-                <Image Source="ms-appx:///Assets/FluentIcons/FluentIconsPowerToys.png" Width="16" />
-                <TextBlock Style="{StaticResource CaptionTextBlockStyle}" Margin="12,0,0,0" Text="PowerToys" />
-            </StackPanel>
-        </Grid>
+        <StackPanel x:Name="CustomTitleBar" Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Stretch">
+            <Image Source="ms-appx:///Assets/FluentIcons/FluentIconsPowerToys.png" Width="16" />
+            <TextBlock Style="{StaticResource CaptionTextBlockStyle}" Margin="12,0,0,0" Text="PowerToys" />
+        </StackPanel>
         <local:ShellPage Grid.Row="1"/>
     </Grid>
 </Window>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI.WinUI3/MainWindow.xaml.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI.WinUI3/MainWindow.xaml.cs
index cf5e34ad6..fe2bea8a1 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI.WinUI3/MainWindow.xaml.cs
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI.WinUI3/MainWindow.xaml.cs
@@ -19,8 +19,8 @@ namespace Microsoft.PowerToys.Settings.UI.WinUI3
         public MainWindow()
         {
             this.InitializeComponent();
-            this.ExtendsContentIntoTitleBar = true;
-            this.SetTitleBar(CustomTitleBar); // This should work according to docs, but it doesn't.... So disabling for now together with ExtendsContentIntoTitleBar
+            ExtendsContentIntoTitleBar = true;
+            SetTitleBar(CustomTitleBar); // This should work according to docs, but it doesn't.... So disabling for now together with ExtendsContentIntoTitleBar
 
             // send IPC Message
             ShellPage.SetDefaultSndMessageCallback(msg =>