Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-03 09:46:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Upgrading to WASDK 1.8.5 and removing TitleBar workarounds (#45532)

Browse Source 
- Upgrade to WASDK 1.8.5 that includes a fix for the `TitleBar` control.
- Remove the workaround from windows that use this control, as we can
set the `TitleBar` directly now
This commit is contained in:
Niels Laute
2026-02-24 13:01:44 +01:00
committed by GitHub
parent 6fe4361a20
commit e8ccb7099e
15 changed files with 34 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml
View File

@@ -21,13 +21,9 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<TitleBar x:Name="titleBar" IsTabStop="False">
<!-- 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
Height="16"
Margin="16,0,0,0"
Source="/Assets/FileLocksmith/Icon.ico" />
</TitleBar.LeftHeader>
<TitleBar.IconSource>
<ImageIconSource ImageSource="/Assets/FileLocksmith/Icon.ico" />
</TitleBar.IconSource>
</TitleBar>
<views:MainPage x:Name="mainPage" Grid.Row="1" />
</Grid>

1
src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml.cs
View File

@@ -20,7 +20,6 @@ namespace FileLocksmithUI
mainPage.ViewModel.IsElevated = isElevated;
SetTitleBar(titleBar);
ExtendsContentIntoTitleBar = true;
AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Tall;
AppWindow.SetIcon("Assets/FileLocksmith/Icon.ico");
WindowHelpers.ForceTopBorder1PixelInsetOnWindows10(this.GetWindowHandle());