refactor: 移除 WinUIEx

Author: KiyanYang

src/DotVast.HashTool.WinUI/DotVast.HashTool.WinUI.csproj

@@ -67,7 +67,6 @@
     <PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageReference Include="System.IO.Hashing" Version="9.0.0" />
-    <PackageReference Include="WinUIEx" Version="2.3.4" />
   </ItemGroup>
 
   <ItemGroup>

src/DotVast.HashTool.WinUI/MainWindow.xaml

@@ -1,14 +1,15 @@
-<windowex:WindowEx
+<Window
     x:Class="DotVast.HashTool.WinUI.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:windowex="using:WinUIEx"
-    Width="840"
-    Height="540"
-    MinWidth="500"
-    MinHeight="300"
-    PersistenceId="MainWindow">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--
+        Width="840"
+        Height="540"
+        MinWidth="500"
+        MinHeight="300"
+        PersistenceId="MainWindow"
+    -->
     <Window.SystemBackdrop>
         <MicaBackdrop />
     </Window.SystemBackdrop>
-</windowex:WindowEx>
+</Window>

src/DotVast.HashTool.WinUI/MainWindow.xaml.cs

@@ -2,12 +2,12 @@
 // Licensed under the MIT License.
 
 using Microsoft.Extensions.Logging;
-
-using WinUIEx;
+using Microsoft.UI.Windowing;
+using Microsoft.UI.Xaml;
 
 namespace DotVast.HashTool.WinUI;
 
-public sealed partial class MainWindow : WindowEx
+public sealed partial class MainWindow : Window
 {
     private readonly ILogger<MainWindow> _logger = App.GetLogger<MainWindow>();
 

src/DotVast.HashTool.WinUI/Services/ActivationService.cs

@@ -9,8 +9,6 @@
 using Microsoft.UI.Xaml;
 using Microsoft.Windows.AppLifecycle;
 
-using WinUIEx;
-
 namespace DotVast.HashTool.WinUI.Services;
 
 public sealed class ActivationService(
@@ -32,19 +30,24 @@ public sealed class ActivationService(
 
     public async Task ActivateAsync(object activationArgs)
     {
+        var mainWindow = App.MainWindow;
+
         // Set the MainWindow Content.
-        App.MainWindow.Content ??= App.GetService<ShellPage>();
+        mainWindow.Content ??= App.GetService<ShellPage>();
 
         // Execute tasks before activation.
         await InitializeAsync();
 
         // Handle activation via ActivationHandlers.
         await HandleActivationAsync(activationArgs);
 
-        App.MainWindow.CenterOnScreen();
+        //TODO: https://github.com/microsoft/WindowsAppSDK/discussions/4710
+        //App.MainWindow.CenterOnScreen();
+        var scale = mainWindow.Content.XamlRoot.RasterizationScale;
+        mainWindow.AppWindow.ResizeClient(new((int)(840 * scale), (int)(540 * scale)));
 
         // Activate the MainWindow.
-        App.MainWindow.Activate();
+        mainWindow.Activate();
 
         // Execute tasks after activation.
         await StartupAsync();

src/DotVast.HashTool.WinUI/Services/Settings/AppearanceSettingsService.cs

@@ -8,6 +8,7 @@
 using DotVast.HashTool.WinUI.Enums;
 using DotVast.HashTool.WinUI.Helpers;
 
+using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 
 using WGAL = Windows.Globalization.ApplicationLanguages;
@@ -30,7 +31,10 @@ public override Task StartupAsync()
         SetIsAlwaysOnTop();
 
         Debug.Assert((App.MainWindow.Content as FrameworkElement)?.RequestedTheme == Theme.ToElementTheme());
-        Debug.Assert(App.MainWindow.IsAlwaysOnTop == IsAlwaysOnTop);
+        if (App.MainWindow.AppWindow.Presenter is OverlappedPresenter presenter)
+        {
+            Debug.Assert(presenter.IsAlwaysOnTop == IsAlwaysOnTop);
+        }
         Debug.Assert(WGAL.PrimaryLanguageOverride == Language.ToTag());
 
         return Task.CompletedTask;
@@ -54,7 +58,10 @@ public bool IsAlwaysOnTop
     }
     private void SetIsAlwaysOnTop()
     {
-        App.MainWindow.IsAlwaysOnTop = IsAlwaysOnTop;
+        if (App.MainWindow.AppWindow.Presenter is OverlappedPresenter presenter)
+        {
+            presenter.IsAlwaysOnTop = IsAlwaysOnTop;
+        }
     }
     #endregion IsAlwaysOnTop
 

src/DotVast.HashTool.WinUI/ViewModels/HomeViewModel.Commands.cs

@@ -28,7 +28,7 @@ private async Task PickAsync()
                 FileOpenPicker picker = new();
                 picker.FileTypeFilter.Add("*");
 
-                var hwnd = WinUIEx.HwndExtensions.GetActiveWindow();
+                var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(App.MainWindow);
                 WinRT.Interop.InitializeWithWindow.Initialize(picker, hwnd);
 
                 var result = await picker.PickMultipleFilesAsync();
@@ -42,7 +42,7 @@ private async Task PickAsync()
                 FolderPicker picker = new();
                 picker.FileTypeFilter.Add("*");
 
-                var hwnd = WinUIEx.HwndExtensions.GetActiveWindow();
+                var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(App.MainWindow);
                 WinRT.Interop.InitializeWithWindow.Initialize(picker, hwnd);
 
                 var result = await picker.PickSingleFolderAsync();

src/DotVast.HashTool.WinUI/ViewModels/TasksViewModel.cs

@@ -110,7 +110,7 @@ private async Task SaveAsync()
         picker.FileTypeChoices.Add("Text", [".txt"]);
         picker.FileTypeChoices.Add("JSON", [".json"]);
 
-        var hwnd = WinUIEx.HwndExtensions.GetActiveWindow();
+        var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(App.MainWindow);
         WinRT.Interop.InitializeWithWindow.Initialize(picker, hwnd);
 
         var file = await picker.PickSaveFileAsync();