Fix conflict

niels9001 · niels9001 · commit 34397e930d3c · 2026-02-12T10:42:22.000+01:00
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml
@@ -28,14 +28,9 @@
             IsBackButtonVisible="False"
             IsPaneToggleButtonVisible="False"
             PaneToggleRequested="TitleBar_PaneButtonClick">
-            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
-            <TitleBar.LeftHeader>
-                <ImageIcon
-                    x:Name="TitleBarIcon"
-                    Height="16"
-                    Margin="16,0,0,0"
-                    Source="/Assets/Settings/icon.ico" />
-            </TitleBar.LeftHeader>
+            <TitleBar.IconSource>
+                <ImageIconSource ImageSource="/Assets/Settings/icon.ico" />
+            </TitleBar.IconSource>
         </TitleBar>
         <NavigationView
             x:Name="navigationView"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml.cs
@@ -120,12 +120,10 @@ private void NavigationView_DisplayModeChanged(NavigationView sender, Navigation
         {
             if (args.DisplayMode == NavigationViewDisplayMode.Compact || args.DisplayMode == NavigationViewDisplayMode.Minimal)
             {
-                TitleBarIcon.Margin = new Thickness(0, 0, 8, 0); // Workaround, see XAML comment
                 AppTitleBar.IsPaneToggleButtonVisible = true;
             }
             else
             {
-                TitleBarIcon.Margin = new Thickness(16, 0, 0, 0);  // Workaround, see XAML comment
                 AppTitleBar.IsPaneToggleButtonVisible = false;
             }
         }
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/ScoobeWindow.xaml b/src/settings-ui/Settings.UI/SettingsXAML/ScoobeWindow.xaml
@@ -27,14 +27,9 @@
             IsBackButtonVisible="False"
             IsPaneToggleButtonVisible="False"
             PaneToggleRequested="TitleBar_PaneButtonClick">
-            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
-            <TitleBar.LeftHeader>
-                <ImageIcon
-                    x:Name="TitleBarIcon"
-                    Height="16"
-                    Margin="16,0,0,0"
-                    Source="/Assets/Settings/icon.ico" />
-            </TitleBar.LeftHeader>
+            <TitleBar.IconSource>
+                <ImageIconSource ImageSource="/Assets/Settings/icon.ico" />
+            </TitleBar.IconSource>
         </TitleBar>
         <NavigationView
             x:Name="navigationView"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/ScoobeWindow.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/ScoobeWindow.xaml.cs
@@ -194,12 +194,10 @@ private void NavigationView_DisplayModeChanged(NavigationView sender, Navigation
         {
             if (args.DisplayMode == NavigationViewDisplayMode.Compact || args.DisplayMode == NavigationViewDisplayMode.Minimal)
             {
-                TitleBarIcon.Margin = new Thickness(0, 0, 8, 0); // Workaround, see XAML comment
                 AppTitleBar.IsPaneToggleButtonVisible = true;
             }
             else
             {
-                TitleBarIcon.Margin = new Thickness(16, 0, 0, 0);  // Workaround, see XAML comment
                 AppTitleBar.IsPaneToggleButtonVisible = false;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -120,12 +120,10 @@ private void NavigationView_DisplayModeChanged(NavigationView sender, Navigation`
`120`	`120`	`{`
`121`	`121`	`if (args.DisplayMode == NavigationViewDisplayMode.Compact \|\| args.DisplayMode == NavigationViewDisplayMode.Minimal)`
`122`	`122`	`{`
`123`		`- TitleBarIcon.Margin = new Thickness(0, 0, 8, 0); // Workaround, see XAML comment`
`124`	`123`	`AppTitleBar.IsPaneToggleButtonVisible = true;`
`125`	`124`	`}`
`126`	`125`	`else`
`127`	`126`	`{`
`128`		`- TitleBarIcon.Margin = new Thickness(16, 0, 0, 0); // Workaround, see XAML comment`
`129`	`127`	`AppTitleBar.IsPaneToggleButtonVisible = false;`
`130`	`128`	`}`
`131`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -194,12 +194,10 @@ private void NavigationView_DisplayModeChanged(NavigationView sender, Navigation`
`194`	`194`	`{`
`195`	`195`	`if (args.DisplayMode == NavigationViewDisplayMode.Compact \|\| args.DisplayMode == NavigationViewDisplayMode.Minimal)`
`196`	`196`	`{`
`197`		`- TitleBarIcon.Margin = new Thickness(0, 0, 8, 0); // Workaround, see XAML comment`
`198`	`197`	`AppTitleBar.IsPaneToggleButtonVisible = true;`
`199`	`198`	`}`
`200`	`199`	`else`
`201`	`200`	`{`
`202`		`- TitleBarIcon.Margin = new Thickness(16, 0, 0, 0); // Workaround, see XAML comment`
`203`	`201`	`AppTitleBar.IsPaneToggleButtonVisible = false;`
`204`	`202`	`}`
`205`	`203`	`}`