Reset cleanup flag on navigation to handle page reuse

Co-authored-by: shuaiyuanxx <128874481+shuaiyuanxx@users.noreply.github.com>

src/settings-ui/QuickAccess.UI/QuickAccessXAML/Flyout/AppsListPage.xaml.cs

@@ -15,10 +15,13 @@ namespace Microsoft.PowerToys.QuickAccess.Flyout;
 public sealed partial class AppsListPage : Page
 {
     private FlyoutNavigationContext? _context;
+    private bool _isCleanedUp = false;
 
     public AppsListPage()
     {
         InitializeComponent();
+        NavigationCacheMode = NavigationCacheMode.Disabled;
+        Unloaded += OnUnloaded;
     }
 
     public AllAppsViewModel ViewModel { get; private set; } = default!;
@@ -26,6 +29,7 @@ public sealed partial class AppsListPage : Page
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         base.OnNavigatedTo(e);
+        _isCleanedUp = false;
 
         if (e.Parameter is FlyoutNavigationContext context)
         {
@@ -36,6 +40,37 @@ public sealed partial class AppsListPage : Page
         }
     }
 
+    protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
+    {
+        base.OnNavigatingFrom(e);
+        CleanupPage();
+    }
+
+    private void OnUnloaded(object sender, RoutedEventArgs e)
+    {
+        CleanupPage();
+    }
+
+    private void CleanupPage()
+    {
+        if (_isCleanedUp)
+        {
+            return;
+        }
+
+        _isCleanedUp = true;
+
+        // Clear the collection before cleaning up to release all item references
+        if (ViewModel != null)
+        {
+            ViewModel.FlyoutMenuItems.Clear();
+        }
+
+        DataContext = null;
+        ViewModel = null!;
+        _context = null;
+    }
+
     private void BackButton_Click(object sender, RoutedEventArgs e)
     {
         if (_context == null || Frame == null)

src/settings-ui/QuickAccess.UI/QuickAccessXAML/Flyout/LaunchPage.xaml.cs

@@ -27,6 +27,7 @@ public sealed partial class LaunchPage : Page
     public LaunchPage()
     {
         InitializeComponent();
+        NavigationCacheMode = NavigationCacheMode.Disabled;
     }
 
     public LauncherViewModel ViewModel { get; private set; } = default!;
@@ -44,6 +45,12 @@ public sealed partial class LaunchPage : Page
         }
     }
 
+    protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
+    {
+        base.OnNavigatingFrom(e);
+        DataContext = null;
+    }
+
     private void SettingsBtn_Click(object sender, RoutedEventArgs e)
     {
         _coordinator?.OpenSettings();

src/settings-ui/QuickAccess.UI/QuickAccessXAML/Flyout/ShellPage.xaml.cs

@@ -65,4 +65,16 @@ public sealed partial class ShellPage : Page
             appsListPage.ViewModel?.RefreshSettings();
         }
     }
+
+    internal void NavigateToLaunchIfNeeded()
+    {
+        // Always clear FlyoutMenuItems to release memory
+        _allAppsViewModel?.FlyoutMenuItems.Clear();
+
+        // Navigate back to LaunchPage if on AppsListPage
+        if (ContentFrame.Content is AppsListPage)
+        {
+            NavigateToLaunch();
+        }
+    }
 }

src/settings-ui/QuickAccess.UI/QuickAccessXAML/MainWindow.xaml.cs

@@ -144,7 +144,7 @@ public sealed partial class MainWindow : WindowEx, IDisposable
         var token = _trimCts.Token;
 
         // Delay the trim to avoid aggressive GC during quick toggles
-        Task.Delay(2000, token).ContinueWith(
+        Task.Delay(5000, token).ContinueWith(
             _ =>
         {
             if (token.IsCancellationRequested)
@@ -152,7 +152,24 @@ public sealed partial class MainWindow : WindowEx, IDisposable
                 return;
             }
 
-            TrimMemory();
+            _dispatcherQueue.TryEnqueue(() =>
+            {
+                // Navigate back to LaunchPage before memory trim to release AppsListPage resources
+                ShellHost.NavigateToLaunchIfNeeded();
+
+                // Give UI time to complete cleanup before forcing GC
+                Task.Delay(500, token).ContinueWith(
+                    __ =>
+                {
+                    if (!token.IsCancellationRequested)
+                    {
+                        _dispatcherQueue.TryEnqueue(TrimMemory);
+                    }
+                },
+                    token,
+                    TaskContinuationOptions.None,
+                    TaskScheduler.Default);
+            });
         },
             token,
             TaskContinuationOptions.None,

src/settings-ui/QuickAccess.UI/ViewModels/AllAppsViewModel.cs

@@ -154,6 +154,9 @@ public sealed class AllAppsViewModel : Observable
         if (_coordinator.UpdateModuleEnabled(flyoutItem.Tag, flyoutItem.IsEnabled))
         {
             _coordinator.NotifyUserSettingsInteraction();
+
+            // Trigger re-sort immediately when status changes on UI
+            RefreshFlyoutMenuItems();
         }
     }