From 245ddfa1f01b4c9fa10337246b8045755e5bcce5 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 19 12月 2023 21:03:58 +0800
Subject: [PATCH] Change back to qScopeGuard
---
src/core/contexts/win32windowcontext.cpp | 115 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 97 insertions(+), 18 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index 2cfd8b1..cd1ab62 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -414,10 +414,10 @@
monitorInfo.cbSize = sizeof(monitorInfo);
::GetMonitorInfoW(monitor, &monitorInfo);
return monitorInfo;
- };
+ }
- static inline void moveToDesktopCenter(HWND hwnd) {
- const auto monitorInfo = getMonitorForWindow(hwnd);
+ static inline void moveWindowToDesktopCenter(HWND hwnd) {
+ MONITORINFOEXW monitorInfo = getMonitorForWindow(hwnd);
RECT windowRect{};
::GetWindowRect(hwnd, &windowRect);
const auto newX = monitorInfo.rcMonitor.left +
@@ -426,6 +426,71 @@
(RECT_HEIGHT(monitorInfo.rcMonitor) - RECT_HEIGHT(windowRect)) / 2;
::SetWindowPos(hwnd, nullptr, newX, newY, 0, 0,
SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER);
+ }
+
+ static inline void moveWindowToMonitor(HWND hwnd, const MONITORINFOEXW &activeMonitor) {
+ RECT currentMonitorRect = getMonitorForWindow(hwnd).rcMonitor;
+ RECT activeMonitorRect = activeMonitor.rcMonitor;
+ // We are in the same monitor, nothing to adjust here.
+ if (currentMonitorRect == activeMonitorRect) {
+ return;
+ }
+ RECT currentWindowRect{};
+ ::GetWindowRect(hwnd, ¤tWindowRect);
+ auto newWindowX =
+ activeMonitorRect.left + (currentWindowRect.left - currentMonitorRect.left);
+ auto newWindowY = activeMonitorRect.top + (currentWindowRect.top - currentMonitorRect.top);
+ ::SetWindowPos(hwnd, nullptr, newWindowX, newWindowY, RECT_WIDTH(currentWindowRect),
+ RECT_HEIGHT(currentWindowRect),
+ SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER);
+ }
+
+ static inline void bringWindowToFront(HWND hwnd) {
+ HWND oldForegroundWindow = ::GetForegroundWindow();
+ if (!oldForegroundWindow) {
+ // The foreground window can be NULL, it's not an API error.
+ return;
+ }
+ MONITORINFOEXW activeMonitor = getMonitorForWindow(oldForegroundWindow);
+ // We need to show the window first, otherwise we won't be able to bring it to front.
+ if (!::IsWindowVisible(hwnd)) {
+ ::ShowWindow(hwnd, SW_SHOW);
+ }
+ if (IsMinimized(hwnd)) {
+ // Restore the window if it is minimized.
+ ::ShowWindow(hwnd, SW_RESTORE);
+ // Once we've been restored, throw us on the active monitor.
+ moveWindowToMonitor(hwnd, activeMonitor);
+ // When the window is restored, it will always become the foreground window.
+ // So return early here, we don't need the following code to bring it to front.
+ return;
+ }
+ // OK, our window is not minimized, so now we will try to bring it to front manually.
+ // First try to send a message to the current foreground window to check whether
+ // it is currently hanging or not.
+ if (!::SendMessageTimeoutW(oldForegroundWindow, WM_NULL, 0, 0,
+ SMTO_BLOCK | SMTO_ABORTIFHUNG | SMTO_NOTIMEOUTIFNOTHUNG, 1000,
+ nullptr)) {
+ // The foreground window hangs, can't activate current window.
+ return;
+ }
+ DWORD windowThreadProcessId = ::GetWindowThreadProcessId(oldForegroundWindow, nullptr);
+ DWORD currentThreadId = ::GetCurrentThreadId();
+ // We won't be able to change a window's Z order if it's not our own window,
+ // so we use this small technique to pretend the foreground window is ours.
+ ::AttachThreadInput(windowThreadProcessId, currentThreadId, TRUE);
+
+ [[maybe_unused]] const auto &cleaner =
+ qScopeGuard([windowThreadProcessId, currentThreadId]() {
+ ::AttachThreadInput(windowThreadProcessId, currentThreadId, FALSE); //
+ });
+
+ ::BringWindowToTop(hwnd);
+ // Activate the window too. This will force us to the virtual desktop this
+ // window is on, if it's on another virtual desktop.
+ ::SetActiveWindow(hwnd);
+ // Throw us on the active monitor.
+ moveWindowToMonitor(hwnd, activeMonitor);
}
static inline bool isFullScreen(HWND hwnd) {
@@ -780,7 +845,7 @@
g_wndProcHash->insert(hWnd, ctx);
}
- static inline void removeManagedWindow(HWND hWnd, bool restore) {
+ static inline void removeManagedWindow(HWND hWnd) {
// Remove window handle mapping
if (!g_wndProcHash->remove(hWnd))
return;
@@ -789,11 +854,6 @@
if (g_wndProcHash->empty()) {
WindowsNativeEventFilter::uninstall();
}
-
- // Restore window proc
- if (restore) {
- ::SetWindowLongPtrW(hWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(g_qtWindowProc));
- }
}
Win32WindowContext::Win32WindowContext() : AbstractWindowContext() {
@@ -801,7 +861,7 @@
Win32WindowContext::~Win32WindowContext() {
if (windowId) {
- removeManagedWindow(reinterpret_cast<HWND>(windowId), false);
+ removeManagedWindow(reinterpret_cast<HWND>(windowId));
}
}
@@ -813,7 +873,13 @@
switch (id) {
case CentralizeHook: {
const auto hwnd = reinterpret_cast<HWND>(windowId);
- moveToDesktopCenter(hwnd);
+ moveWindowToDesktopCenter(hwnd);
+ return;
+ }
+
+ case RaiseWindowHook: {
+ const auto hwnd = reinterpret_cast<HWND>(windowId);
+ bringWindowToFront(hwnd);
return;
}
@@ -829,6 +895,23 @@
showSystemMenu2(hWnd, qpoint2point(nativeGlobalPos), false,
m_delegate->isHostSizeFixed(m_host));
return;
+ }
+
+ case WindowAttributeChangedHook: {
+ auto args = static_cast<void **>(data);
+ const auto &key = *static_cast<const QString *>(args[0]);
+ const auto &newVar = *static_cast<const QVariant *>(args[1]);
+ const auto &oldVar = *static_cast<const QVariant *>(args[2]);
+
+ if (key == QStringLiteral("no-frame-shadow")) {
+ if (newVar.toBool()) {
+ // TODO: set off
+ } else {
+ // TODO: set on
+ }
+ }
+
+ break;
}
case DefaultColorsHook: {
@@ -897,11 +980,8 @@
return getWindowFrameBorderThickness(reinterpret_cast<HWND>(windowId));
}
- void Win32WindowContext::winIdChanged(QWindow *oldWindow, bool destroyed) {
- if (oldWindow) {
- removeManagedWindow(reinterpret_cast<HWND>(windowId), !destroyed);
- }
-
+ void Win32WindowContext::winIdChanged(QWindow *oldWindow) {
+ removeManagedWindow(reinterpret_cast<HWND>(windowId));
if (!m_windowHandle) {
return;
}
@@ -1272,7 +1352,7 @@
// function.
if (wParam && !lParam) {
centered = true;
- moveToDesktopCenter(hWnd);
+ moveWindowToDesktopCenter(hWnd);
}
}
break;
@@ -1359,7 +1439,6 @@
// Terminal does, however, later I found that if we choose a proper
// color, our homemade top border can almost have exactly the same
// appearance with the system's one.
-
[[maybe_unused]] const auto &hitTestRecorder = qScopeGuard([this, result]() {
lastHitTestResult = getHitWindowPart(int(*result)); //
});
--
Gitblit v1.9.1