Merge pull request LykosAI#606 from ionite34/go-back-after-install

go back after install
EmojiPati · Apr 14, 2024 · d73ca68 · d73ca68
2 parents c285a0c + fa458e2
commit d73ca68
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/StabilityMatrix.Avalonia/Services/INavigationService.cs b/StabilityMatrix.Avalonia/Services/INavigationService.cs
@@ -39,4 +39,5 @@ void NavigateTo(
     bool GoBack();
 
     bool CanGoBack { get; }
+    object? CurrentPageDataContext { get; }
 }
diff --git a/StabilityMatrix.Avalonia/Services/NavigationService.cs b/StabilityMatrix.Avalonia/Services/NavigationService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using FluentAvalonia.UI.Media.Animation;
 using FluentAvalonia.UI.Navigation;
@@ -190,4 +191,6 @@ public bool GoBack()
     }
 
     public bool CanGoBack => _frame?.CanGoBack ?? false;
+
+    public object? CurrentPageDataContext => (_frame?.Content as Control)?.DataContext;
 }
diff --git a/StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageInstallDetailViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageInstallDetailViewModel.cs
@@ -283,6 +283,13 @@ private async Task Install()
 
         if (!runner.Failed)
         {
+            if (ReferenceEquals(this, packageNavigationService.CurrentPageDataContext))
+            {
+                packageNavigationService.GoBack();
+                packageNavigationService.GoBack();
+                await Task.Delay(100);
+            }
+
             EventManager.Instance.OnInstalledPackagesChanged();
         }
     }