Modern: Bring windows to foreground, fix opening from context menu ca…

…use window in background (#548)
M2Team · Jan 18, 2025 · 5e042a7 · 5e042a7
1 parent e3e8871
commit 5e042a7
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/NanaZip.UI.Modern/MainWindowToolBarPage.cpp b/NanaZip.UI.Modern/MainWindowToolBarPage.cpp
@@ -481,6 +481,8 @@ namespace winrt::NanaZip::Modern::implementation
                 return;
             }
 
+            AllowSetForegroundWindow(GetProcessId(ProcessInformation.hProcess));
+
             ::CloseHandle(ProcessInformation.hThread);
             ::WaitForSingleObjectEx(ProcessInformation.hProcess, INFINITE, FALSE);
             ::CloseHandle(ProcessInformation.hProcess);

diff --git a/NanaZip.UI.Modern/SevenZip/CPP/Windows/ProcessUtils.cpp b/NanaZip.UI.Modern/SevenZip/CPP/Windows/ProcessUtils.cpp
@@ -22,6 +22,31 @@ static UString GetQuotedString(const UString &s)
 }
 #endif
 
+// **************** NanaZip Modification Start ****************
+static BOOL CALLBACK BringToForeground(HWND hwnd, LPARAM lParam)
+{
+  DWORD processId;
+  GetWindowThreadProcessId(hwnd, &processId);
+
+  if (processId == (DWORD) lParam) {
+    HWND hCurWnd = ::GetForegroundWindow();
+    DWORD dwMyID = ::GetCurrentThreadId();
+    DWORD dwCurID = ::GetWindowThreadProcessId(hCurWnd, NULL);
+    ::AttachThreadInput(dwCurID, dwMyID, TRUE);
+    ::SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
+    ::SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE);
+    ::SetForegroundWindow(hwnd);
+    ::SetFocus(hwnd);
+    ::SetActiveWindow(hwnd);
+    ::AttachThreadInput(dwCurID, dwMyID, FALSE);
+
+    return FALSE;
+  }
+
+  return TRUE;
+}
+// **************** NanaZip Modification End ****************
+
 WRes CProcess::Create(LPCWSTR imageName, const UString &params, LPCWSTR curDir)
 {
   /*
@@ -88,6 +113,13 @@ WRes CProcess::Create(LPCWSTR imageName, const UString &params, LPCWSTR curDir)
   }
   if (result == 0)
     return ::GetLastError();
+
+  // **************** NanaZip Modification Start ****************
+  AllowSetForegroundWindow(GetProcessId(pi.hProcess));
+  ::WaitForInputIdle(pi.hProcess, INFINITE);
+  EnumWindows(BringToForeground, (LPARAM) GetProcessId(pi.hProcess));
+  // **************** NanaZip Modification End ****************
+
   ::CloseHandle(pi.hThread);
   _handle = pi.hProcess;
   return 0;