Fix WinUI model viewer so it can be closed properly. #2048 (#2066)

helix-toolkit · Dec 6, 2023 · 63515f6 · 63515f6
1 parent a59d969
commit 63515f6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Source/Examples/WinUI/ModelViewer/ModelViewer.csproj b/Source/Examples/WinUI/ModelViewer/ModelViewer.csproj
@@ -23,9 +23,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.5" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
   </ItemGroup>
 

diff --git a/Source/Examples/WinUI/ModelViewer/Views/ShellPage.xaml.cs b/Source/Examples/WinUI/ModelViewer/Views/ShellPage.xaml.cs
@@ -1,4 +1,5 @@
-using Microsoft.UI.Xaml;
+using HelixToolkit.SharpDX.Core;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media;
@@ -31,9 +32,15 @@ public ShellPage(ShellViewModel viewModel)
         App.MainWindow.ExtendsContentIntoTitleBar = true;
         App.MainWindow.SetTitleBar(AppTitleBar);
         App.MainWindow.Activated += MainWindow_Activated;
+        App.MainWindow.Closed += MainWindow_Closed;
         AppTitleBarText.Text = "AppDisplayName".GetLocalized();
     }
 
+    private void MainWindow_Closed(object sender, WindowEventArgs args)
+    {
+        App.GetService<IEffectsManager>().Dispose();
+    }
+
     private void OnLoaded(object sender, RoutedEventArgs e)
     {
         TitleBarHelper.UpdateTitleBar(RequestedTheme);