Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-02-23 19:49:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
Niels Laute
2026-02-12 10:42:22 +01:00
parent e0aba967ee
commit 34397e930d
4 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml
View File

@@ -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"

2
src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml.cs
View File

@@ -120,12 +120,10 @@ namespace Microsoft.PowerToys.Settings.UI
{
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;
}
}

11
src/settings-ui/Settings.UI/SettingsXAML/ScoobeWindow.xaml
View File

@@ -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"

2
src/settings-ui/Settings.UI/SettingsXAML/ScoobeWindow.xaml.cs
View File

@@ -194,12 +194,10 @@ namespace Microsoft.PowerToys.Settings.UI
{
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;
}
}