From dec34d131a925ede768fd6c6f167522cfda9645f Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <zhaoyuhang@rankyee.com>
Date: ćšć, 07 12æ 2023 18:01:28 +0800
Subject: [PATCH] a little simplify
---
src/core/contexts/win32windowcontext.cpp | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index 44bd408..0703351 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -432,9 +432,6 @@
QT_NATIVE_EVENT_RESULT_TYPE *result) override {
Q_UNUSED(eventType)
- auto orgLastMessageContext = lastMessageContext;
- lastMessageContext = nullptr;
-
// It has been observed that the pointer that Qt gives us is sometimes null on some
// machines. We need to guard against it in such scenarios.
if (!result) {
@@ -445,9 +442,9 @@
// Qt needs to refer to the WM_NCCALCSIZE message data that hasn't been processed, so we
// have to process it after Qt acquired the initial data.
auto msg = static_cast<const MSG *>(message);
- if (msg->message == WM_NCCALCSIZE && orgLastMessageContext) {
+ if (msg->message == WM_NCCALCSIZE && lastMessageContext) {
LRESULT res;
- if (Win32WindowContext::nonClientCalcSizeHandler(msg->hwnd, msg->message,
+ if (lastMessageContext->nonClientCalcSizeHandler(msg->hwnd, msg->message,
msg->wParam, msg->lParam, &res)) {
*result = decltype(*result)(res);
return true;
@@ -549,22 +546,18 @@
// forward it right away and process it in our native event filter.
if (message == WM_NCCALCSIZE) {
WindowsNativeEventFilter::lastMessageContext = ctx;
- return ::CallWindowProcW(g_qtWindowProc, hWnd, message, wParam, lParam);
+ LRESULT result = ::CallWindowProcW(g_qtWindowProc, hWnd, message, wParam, lParam);
+ WindowsNativeEventFilter::lastMessageContext = nullptr;
+ return result;
}
// Try hooked procedure and save result
LRESULT result;
- bool handled = ctx->windowProc(hWnd, message, wParam, lParam, &result);
-
- // TODO: Determine whether to show system menu
- // ...
-
- if (handled) {
+ if (ctx->windowProc(hWnd, message, wParam, lParam, &result)) {
return result;
}
// Continue dispatching.
- WindowsNativeEventFilter::lastMessageContext = ctx;
return ::CallWindowProcW(g_qtWindowProc, hWnd, message, wParam, lParam);
}
@@ -631,6 +624,10 @@
if (!isValidWindow(hWnd, false, true)) {
return false;
+ }
+
+ if (systemMenuHandler(hWnd, message, wParam, lParam, result)) {
+ return true;
}
// Test snap layout
@@ -1511,4 +1508,9 @@
return true;
}
+ bool Win32WindowContext::systemMenuHandler(HWND hWnd, UINT message, WPARAM wParam,
+ LPARAM lParam, LRESULT *result) {
+ return false;
+ }
+
}
--
Gitblit v1.9.1