Update

Author: 0x5bfa

src/Files.App/Helpers/Application/AppLifecycleHelper.cs

@@ -18,8 +18,6 @@
 using Windows.Storage;
 using Windows.System;
 using Windows.UI.Notifications;
-using Windows.Win32;
-using Windows.Win32.UI.WindowsAndMessaging;
 using LogLevel = Microsoft.Extensions.Logging.LogLevel;
 
 namespace Files.App.Helpers
@@ -236,33 +234,6 @@ public static void SaveSessionTabs()
 			.ToList();
 		}
 
-		/// <summary>
-		/// Brings the app window to foreground.
-		/// </summary>
-		/// <remarks>
-		/// For more information, visit
-		/// <br/>
-		/// - <a href="https://stackoverflow.com/questions/1544179/what-are-the-differences-between-bringwindowtotop-setforegroundwindow-setwindo" />
-		/// <br/>
-		/// - <a href="https://stackoverflow.com/questions/916259/win32-bring-a-window-to-top" />
-		/// </remarks>
-		/// <param name="hWnd">The window handle to bring.</param>
-		public static unsafe void BringToForegroundEx(Windows.Win32.Foundation.HWND hWnd)
-		{
-			var hCurWnd = PInvoke.GetForegroundWindow();
-			var dwMyID = PInvoke.GetCurrentThreadId();
-			var dwCurID = PInvoke.GetWindowThreadProcessId(hCurWnd);
-
-			PInvoke.AttachThreadInput(dwCurID, dwMyID, true);
-
-			PInvoke.SetWindowPos(hWnd, (Windows.Win32.Foundation.HWND)(-1), 0, 0, 0, 0, SET_WINDOW_POS_FLAGS.SWP_NOSIZE | SET_WINDOW_POS_FLAGS.SWP_NOMOVE);
-			PInvoke.SetWindowPos(hWnd, (Windows.Win32.Foundation.HWND)(-2), 0, 0, 0, 0, SET_WINDOW_POS_FLAGS.SWP_SHOWWINDOW | SET_WINDOW_POS_FLAGS.SWP_NOSIZE | SET_WINDOW_POS_FLAGS.SWP_NOMOVE);
-			PInvoke.SetForegroundWindow(hWnd);
-			PInvoke.SetFocus(hWnd);
-			PInvoke.SetActiveWindow(hWnd);
-			PInvoke.AttachThreadInput(dwCurID, dwMyID, false);
-		}
-
 		/// <summary>
 		/// Shows exception on the Debug Output and sends Toast Notification to the Windows Notification Center.
 		/// </summary>

src/Files.App/Helpers/Win32/Win32Helper.WindowManagement.cs

@@ -0,0 +1,38 @@
+// Copyright (c) 2023 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+using Windows.Win32;
+using Windows.Win32.UI.WindowsAndMessaging;
+
+namespace Files.App.Helpers
+{
+	public static class Win32Helper
+	{
+		/// <summary>
+		/// Brings the app window to foreground.
+		/// </summary>
+		/// <remarks>
+		/// For more information, visit
+		/// <br/>
+		/// - <a href="https://stackoverflow.com/questions/1544179/what-are-the-differences-between-bringwindowtotop-setforegroundwindow-setwindo" />
+		/// <br/>
+		/// - <a href="https://stackoverflow.com/questions/916259/win32-bring-a-window-to-top" />
+		/// </remarks>
+		/// <param name="hWnd">The window handle to bring.</param>
+		public static unsafe void BringToForegroundEx(Windows.Win32.Foundation.HWND hWnd)
+		{
+			var hCurWnd = PInvoke.GetForegroundWindow();
+			var dwMyID = PInvoke.GetCurrentThreadId();
+			var dwCurID = PInvoke.GetWindowThreadProcessId(hCurWnd);
+
+			PInvoke.AttachThreadInput(dwCurID, dwMyID, true);
+
+			PInvoke.SetWindowPos(hWnd, (Windows.Win32.Foundation.HWND)(-1), 0, 0, 0, 0, SET_WINDOW_POS_FLAGS.SWP_NOSIZE | SET_WINDOW_POS_FLAGS.SWP_NOMOVE);
+			PInvoke.SetWindowPos(hWnd, (Windows.Win32.Foundation.HWND)(-2), 0, 0, 0, 0, SET_WINDOW_POS_FLAGS.SWP_SHOWWINDOW | SET_WINDOW_POS_FLAGS.SWP_NOSIZE | SET_WINDOW_POS_FLAGS.SWP_NOMOVE);
+			PInvoke.SetForegroundWindow(hWnd);
+			PInvoke.SetFocus(hWnd);
+			PInvoke.SetActiveWindow(hWnd);
+			PInvoke.AttachThreadInput(dwCurID, dwMyID, false);
+		}
+	}
+}

src/Files.App/MainWindow.xaml.cs

@@ -94,7 +94,7 @@ public async Task InitializeApplicationAsync(object activatedEventArgs)
 					else if (!(string.IsNullOrEmpty(launchArgs.Arguments) && MainPageViewModel.AppInstances.Count > 0))
 					{
 						// Bring to foreground (#14730)
-						AppLifecycleHelper.BringToForegroundEx(new(WindowHandle));
+						Win32Helper.BringToForegroundEx(new(WindowHandle));
 
 						await NavigationHelpers.AddNewTabByPathAsync(typeof(PaneHolderPage), launchArgs.Arguments, true);
 					}
@@ -112,7 +112,7 @@ public async Task InitializeApplicationAsync(object activatedEventArgs)
 						if (MainPageViewModel.AppInstances.Count > 0)
 						{
 							// Bring to foreground (#14730)
-							AppLifecycleHelper.BringToForegroundEx(new(WindowHandle));
+							Win32Helper.BringToForegroundEx(new(WindowHandle));
 						}
 					}
 					else
@@ -181,7 +181,7 @@ public async Task InitializeApplicationAsync(object activatedEventArgs)
 					else
 					{
 						// Bring to foreground (#14730)
-						AppLifecycleHelper.BringToForegroundEx(new(WindowHandle));
+						Win32Helper.BringToForegroundEx(new(WindowHandle));
 					}
 
 					for (; index < fileArgs.Files.Count; index++)
@@ -258,7 +258,7 @@ async Task PerformNavigationAsync(string payload, string selectItem = null)
 				if (rootFrame.Content is MainPage && MainPageViewModel.AppInstances.Any())
 				{
 					// Bring to foreground (#14730)
-					AppLifecycleHelper.BringToForegroundEx(new(WindowHandle));
+					Win32Helper.BringToForegroundEx(new(WindowHandle));
 
 					await NavigationHelpers.AddNewTabByParamAsync(typeof(PaneHolderPage), paneNavigationArgs);
 				}