Prevent window from pulling forward before UAC prompts (#5353)

Author: GabrielDuf

src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs

@@ -19,7 +19,6 @@
 using UniGetUI.Avalonia.Views.Controls;
 using UniGetUI.Avalonia.Views.DialogPages;
 using UniGetUI.Avalonia.Views.Pages;
-using UniGetUI.Core.Data;
 using UniGetUI.Core.Logging;
 using UniGetUI.Core.SettingsEngine;
 using UniGetUI.Core.Tools;
@@ -190,12 +189,6 @@ public MainWindow()
 
         _trayService = new TrayService(this);
         _trayService.UpdateStatus();
-
-        // Let the elevation code activate us right before a UAC prompt, so we own the foreground
-        // and can delegate it to the consent UI (#5146). Only activate when we're already on screen;
-        // don't yank a tray-hidden window forward during silent/background elevation.
-        CoreData.BringMainWindowToForegroundAsync = () =>
-            Dispatcher.UIThread.InvokeAsync(() => { if (IsVisible) ShowFromTray(); }).GetTask();
     }
 
     protected override void OnOpened(EventArgs e)

src/UniGetUI.Core.Data/CoreData.cs

@@ -388,14 +388,6 @@ public static string UniGetUIExecutableFile
         /// </summary>
         public static string ElevatorArgs = "";
 
-        /// <summary>
-        /// Set by the UI layer to bring the main window to the foreground and wait until it is.
-        /// Called right before a UAC prompt is triggered so the app owns the foreground and can
-        /// delegate it to the consent UI (fixes prompts hiding behind the window with secure desktop off).
-        /// Null in headless mode, where no window exists to activate.
-        /// </summary>
-        public static Func<Task>? BringMainWindowToForegroundAsync;
-
         /// <summary>
         /// This method will return the most appropriate data directory.
         /// If the new directory exists, it will be used.

src/UniGetUI.Core.Tools/Tools.cs

@@ -752,19 +752,18 @@ public static string EnsureSafeQueryString(string query)
         private static extern bool AllowSetForegroundWindow(int dwProcessId);
 
         /// <summary>
-        /// Windows: bring UniGetUI to the foreground and grant foreground rights so an imminent
-        /// UAC consent prompt surfaces in front instead of only flashing the taskbar (#5146).
-        /// No-op elsewhere, and when the app owns no visible foreground window to delegate.
+        /// Windows: hand our foreground rights to the imminent UAC consent prompt so it surfaces
+        /// in front instead of only flashing the taskbar (#5146). Windows decides whether we
+        /// still hold that privilege and grants nothing once another app owns the foreground.
+        /// Either way this only ever lets the consent UI come forward; it never activates our
+        /// own window, so a minimized UniGetUI stays minimized (#5102). No-op elsewhere.
         /// Must be called immediately before launching the elevator.
         /// </summary>
-        public static async Task PrepareForegroundForElevationAsync()
+        public static void PrepareForegroundForElevation()
         {
             if (!OperatingSystem.IsWindows())
                 return;
 
-            var bringToFront = CoreData.BringMainWindowToForegroundAsync;
-            if (bringToFront is not null)
-                await bringToFront();
             AllowSetForegroundWindow(ASFW_ANY);
         }
 
@@ -824,7 +823,7 @@ public static async Task CacheUACForCurrentProcess()
 
                 // When admin-rights caching is enabled, the UAC consent prompt is raised here.
                 // Surface it in front instead of letting it flash unnoticed in the taskbar (#5146).
-                await PrepareForegroundForElevationAsync();
+                PrepareForegroundForElevation();
 
                 p.Start();
                 await p.WaitForExitAsync();

src/UniGetUI.PackageEngine.Operations/AbstractProcessOperation.cs

@@ -140,10 +140,10 @@ protected override async Task<OperationVeredict> PerformOperation()
         CancellationToken.ThrowIfCancellationRequested();
 
         // When admin-rights caching is disabled (or a cache miss), the elevator is launched
-        // directly here and the UAC prompt is raised at this Start() — bring it to the
-        // foreground too, not just on the cached path (#5146).
+        // directly here and the UAC prompt is raised at this Start() — delegate foreground
+        // rights here too, not just on the cached path (#5146).
         if (process.StartInfo.FileName == CoreData.ElevatorPath)
-            await CoreTools.PrepareForegroundForElevationAsync();
+            CoreTools.PrepareForegroundForElevation();
 
         process.Start();
         if (CancellationToken.IsCancellationRequested)