From 995a9ae7a85a386e031e514b98b0580c5a0a3fe1 Mon Sep 17 00:00:00 2001 From: Niels Laute Date: Mon, 5 Jun 2023 17:21:48 +0200 Subject: [PATCH] [Chore] Upgrading to WinUIEx 2.2 (#26000) * Upgrading to WinUIEx 2.2 * Replacing Mica * Fix build * Update notice.md --------- Co-authored-by: Stefan Markovic --- Directory.Packages.props | 2 +- NOTICE.md | 2 +- .../FileLocksmith/FileLocksmithUI/MainWindow.xaml | 11 +++-------- src/modules/Hosts/Hosts/MainWindow.xaml | 6 +++--- src/modules/peek/Peek.UI/MainWindow.xaml | 6 +++--- src/modules/peek/Peek.UI/Views/TitleBar.xaml.cs | 4 ++-- .../registrypreview/RegistryPreviewUI/MainWindow.xaml | 6 +++--- 7 files changed, 16 insertions(+), 21 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index b0bf98c742..7912ed0cdf 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -61,7 +61,7 @@ - + diff --git a/NOTICE.md b/NOTICE.md index 61846f8c94..1e6c6681b2 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -334,5 +334,5 @@ SOFTWARE. - UnitsNet 4.145.0 - Vanara.PInvoke.Shell32 3.4.11 - Vanara.PInvoke.User32 3.4.11 -- WinUIEx 2.1.0 +- WinUIEx 2.2.0 diff --git a/src/modules/FileLocksmith/FileLocksmithUI/MainWindow.xaml b/src/modules/FileLocksmith/FileLocksmithUI/MainWindow.xaml index 31a05fe7c5..19713f1755 100644 --- a/src/modules/FileLocksmith/FileLocksmithUI/MainWindow.xaml +++ b/src/modules/FileLocksmith/FileLocksmithUI/MainWindow.xaml @@ -2,12 +2,7 @@ x:Class="FileLocksmithUI.MainWindow" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)" - xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)" - xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters" - xmlns:converters1="using:PowerToys.FileLocksmithUI.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:interop="using:FileLocksmith.Interop" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:views="using:PowerToys.FileLocksmithUI.Views" xmlns:winuiex="using:WinUIEx" @@ -18,9 +13,9 @@ IsShownInSwitchers="True" IsTitleBarVisible="True" mc:Ignorable="d"> - - - + + + diff --git a/src/modules/Hosts/Hosts/MainWindow.xaml b/src/modules/Hosts/Hosts/MainWindow.xaml index b113bf3e07..99e7aeee85 100644 --- a/src/modules/Hosts/Hosts/MainWindow.xaml +++ b/src/modules/Hosts/Hosts/MainWindow.xaml @@ -12,9 +12,9 @@ MinWidth="480" MinHeight="320" mc:Ignorable="d"> - - - + + + diff --git a/src/modules/peek/Peek.UI/MainWindow.xaml b/src/modules/peek/Peek.UI/MainWindow.xaml index 28e9dabc4f..e8d8b2aab0 100644 --- a/src/modules/peek/Peek.UI/MainWindow.xaml +++ b/src/modules/peek/Peek.UI/MainWindow.xaml @@ -11,9 +11,9 @@ xmlns:views="using:Peek.UI.Views" xmlns:winuiex="using:WinUIEx" mc:Ignorable="d"> - - - + + + diff --git a/src/modules/peek/Peek.UI/Views/TitleBar.xaml.cs b/src/modules/peek/Peek.UI/Views/TitleBar.xaml.cs index db2f1742ae..84b3389643 100644 --- a/src/modules/peek/Peek.UI/Views/TitleBar.xaml.cs +++ b/src/modules/peek/Peek.UI/Views/TitleBar.xaml.cs @@ -189,7 +189,7 @@ namespace Peek.UI.Views return; } - var appWindow = MainWindow.GetAppWindow(); + var appWindow = MainWindow.AppWindow; if (AppWindowTitleBar.IsCustomizationSupported() && appWindow != null && appWindow.TitleBar.ExtendsContentIntoTitleBar) { var scale = MainWindow.GetMonitorScale(); @@ -222,7 +222,7 @@ namespace Peek.UI.Views { if (AppWindowTitleBar.IsCustomizationSupported()) { - AppWindow appWindow = mainWindow.GetAppWindow(); + AppWindow appWindow = mainWindow.AppWindow; appWindow.TitleBar.ExtendsContentIntoTitleBar = true; appWindow.TitleBar.ButtonBackgroundColor = Colors.Transparent; appWindow.TitleBar.ButtonInactiveBackgroundColor = Colors.Transparent; diff --git a/src/modules/registrypreview/RegistryPreviewUI/MainWindow.xaml b/src/modules/registrypreview/RegistryPreviewUI/MainWindow.xaml index dc3e5f4cc5..eed17610f9 100644 --- a/src/modules/registrypreview/RegistryPreviewUI/MainWindow.xaml +++ b/src/modules/registrypreview/RegistryPreviewUI/MainWindow.xaml @@ -8,9 +8,9 @@ xmlns:winuiex="using:WinUIEx" Closed="Window_Closed" mc:Ignorable="d"> - - - + + +