From 564f33e8b29a6f73050f4da3f843b942aaf0d739 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周三, 08 5月 2024 19:36:16 +0800
Subject: [PATCH] Improve event filter handling
---
src/core/contexts/win32windowcontext.cpp | 430 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 335 insertions(+), 95 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index e0db522..a75efe7 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -6,13 +6,16 @@
#include <optional>
+#include <QtCore/QAbstractEventDispatcher>
+#include <QtCore/QDateTime>
#include <QtCore/QHash>
#include <QtCore/QScopeGuard>
#include <QtCore/QTimer>
-#include <QtCore/QDateTime>
#include <QtGui/QGuiApplication>
#include <QtGui/QPainter>
#include <QtGui/QPalette>
+
+#include <QtGui/qpa/qwindowsysteminterface.h>
#include <QtGui/private/qhighdpiscaling_p.h>
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
@@ -31,6 +34,12 @@
#include "qwkwindowsextra_p.h"
namespace QWK {
+
+ enum IconButtonClickLevelFlag {
+ IconButtonClicked = 1,
+ IconButtonDoubleClicked = 2,
+ IconButtonTriggersClose = 4,
+ };
// The thickness of an auto-hide taskbar in pixels.
static constexpr const quint8 kAutoHideTaskBarThickness = 2;
@@ -153,7 +162,7 @@
[[maybe_unused]] const auto &cleaner =
qScopeGuard([windowThreadProcessId, currentThreadId]() {
::AttachThreadInput(windowThreadProcessId, currentThreadId, FALSE); //
- });
+ }); // TODO: Remove it
::BringWindowToTop(hwnd);
// Activate the window too. This will force us to the virtual desktop this
@@ -230,14 +239,15 @@
apis.ptimeEndPeriod(ms_granularity);
}
- static void showSystemMenu2(HWND hWnd, const POINT &pos, const bool selectFirstEntry,
- const bool fixedSize) {
+ // Returns false if the menu is canceled
+ static bool showSystemMenu_sys(HWND hWnd, const POINT &pos, const bool selectFirstEntry,
+ const bool fixedSize) {
HMENU hMenu = ::GetSystemMenu(hWnd, FALSE);
if (!hMenu) {
// The corresponding window doesn't have a system menu, most likely due to the
// lack of the "WS_SYSMENU" window style. This situation should not be treated
// as an error so just ignore it and return early.
- return;
+ return true;
}
const bool maxOrFull = IsMaximized(hWnd) || isFullScreen(hWnd);
@@ -281,7 +291,8 @@
// Popup the system menu at the required position.
const auto result = ::TrackPopupMenu(
hMenu,
- (TPM_RETURNCMD | (QGuiApplication::isRightToLeft() ? TPM_RIGHTALIGN : TPM_LEFTALIGN)),
+ (TPM_RETURNCMD | (QGuiApplication::isRightToLeft() ? TPM_RIGHTALIGN : TPM_LEFTALIGN) |
+ TPM_RIGHTBUTTON),
pos.x, pos.y, 0, hWnd, nullptr);
// Unhighlight the first menu item after the popup menu is closed, otherwise it will keep
@@ -290,11 +301,12 @@
if (!result) {
// The user canceled the menu, no need to continue.
- return;
+ return false;
}
// Send the command that the user chooses to the corresponding window.
::PostMessageW(hWnd, WM_SYSCOMMAND, result, 0);
+ return true;
}
static inline Win32WindowContext::WindowPart getHitWindowPart(int hitTestResult) {
@@ -359,6 +371,107 @@
return true;
}
+ static inline constexpr bool isNonClientMessage(const UINT message) {
+ if (((message >= WM_NCCREATE) && (message <= WM_NCACTIVATE)) ||
+ ((message >= WM_NCMOUSEMOVE) && (message <= WM_NCMBUTTONDBLCLK)) ||
+ ((message >= WM_NCXBUTTONDOWN) && (message <= WM_NCXBUTTONDBLCLK))
+#if (WINVER >= _WIN32_WINNT_WIN8)
+ || ((message >= WM_NCPOINTERUPDATE) && (message <= WM_NCPOINTERUP))
+#endif
+ || ((message == WM_NCMOUSEHOVER) || (message == WM_NCMOUSELEAVE))) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ static MSG createMessageBlock(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
+ MSG msg;
+ msg.hwnd = hWnd; // re-create MSG structure
+ msg.message = message; // time and pt fields ignored
+ msg.wParam = wParam;
+ msg.lParam = lParam;
+
+ const DWORD dwScreenPos = ::GetMessagePos();
+ msg.pt.x = GET_X_LPARAM(dwScreenPos);
+ msg.pt.y = GET_Y_LPARAM(dwScreenPos);
+ if (!isNonClientMessage(message)) {
+ ::ScreenToClient(hWnd, &msg.pt);
+ }
+ return msg;
+ }
+
+ static inline constexpr bool isInputMessage(UINT m) {
+ switch (m) {
+ case WM_IME_STARTCOMPOSITION:
+ case WM_IME_ENDCOMPOSITION:
+ case WM_IME_COMPOSITION:
+ case WM_INPUT:
+ case WM_TOUCH:
+ case WM_MOUSEHOVER:
+ case WM_MOUSELEAVE:
+ case WM_NCMOUSEHOVER:
+ case WM_NCMOUSELEAVE:
+ case WM_SIZING:
+ case WM_MOVING:
+ case WM_SYSCOMMAND:
+ case WM_COMMAND:
+ case WM_DWMNCRENDERINGCHANGED:
+ case WM_PAINT:
+ return true;
+ default:
+ break;
+ }
+ return (m >= WM_MOUSEFIRST && m <= WM_MOUSELAST) ||
+ (m >= WM_NCMOUSEMOVE && m <= WM_NCXBUTTONDBLCLK) ||
+ (m >= WM_KEYFIRST && m <= WM_KEYLAST);
+ }
+
+ static inline QByteArray nativeEventType() {
+ return QByteArrayLiteral("windows_generic_MSG");
+ }
+
+ // Send to QAbstractEventDispatcher
+ bool filterNativeEvent(MSG *msg, LRESULT *result) {
+ auto dispatcher = QAbstractEventDispatcher::instance();
+ QT_NATIVE_EVENT_RESULT_TYPE filterResult = *result;
+ if (dispatcher && dispatcher->filterNativeEvent(nativeEventType(), msg, &filterResult)) {
+ *result = LRESULT(filterResult);
+ return true;
+ }
+ return false;
+ }
+
+ // Send to QWindowSystemInterface
+ bool filterNativeEvent(QWindow *window, MSG *msg, LRESULT *result) {
+ QT_NATIVE_EVENT_RESULT_TYPE filterResult = *result;
+ if (QWindowSystemInterface::handleNativeEvent(window, nativeEventType(), msg,
+ &filterResult)) {
+ *result = LRESULT(filterResult);
+ return true;
+ }
+ return false;
+ }
+
+ static inline bool forwardFilteredEvent(QWindow *window, HWND hWnd, UINT message, WPARAM wParam,
+ LPARAM lParam, LRESULT *result) {
+ MSG msg = createMessageBlock(hWnd, message, wParam, lParam);
+
+ // https://github.com/qt/qtbase/blob/e26a87f1ecc40bc8c6aa5b889fce67410a57a702/src/plugins/platforms/windows/qwindowscontext.cpp#L1025
+ // Do exact the same as what Qt Windows plugin does.
+
+ // Run the native event filters. QTBUG-67095: Exclude input messages which are sent
+ // by QEventDispatcherWin32::processEvents()
+ if (!isInputMessage(msg.message) && filterNativeEvent(&msg, result))
+ return true;
+
+ auto platformWindow = window->handle();
+ if (platformWindow && filterNativeEvent(platformWindow->window(), &msg, result))
+ return true;
+
+ return false;
+ }
+
// https://github.com/qt/qtbase/blob/e26a87f1ecc40bc8c6aa5b889fce67410a57a702/src/plugins/platforms/windows/qwindowscontext.cpp#L1556
// In QWindowsContext::windowsProc(), the messages will be passed to all global native event
// filters, but because we have already filtered the messages in the hook WndProc function for
@@ -378,17 +491,38 @@
return false;
}
- // https://github.com/qt/qtbase/blob/e26a87f1ecc40bc8c6aa5b889fce67410a57a702/src/plugins/platforms/windows/qwindowscontext.cpp#L1546
- // Qt needs to refer to the WM_NCCALCSIZE message data that hasn't been processed, so we
- // have to process it after Qt acquires the initial data.
auto msg = static_cast<const MSG *>(message);
- if (msg->message == WM_NCCALCSIZE && lastMessageContext) {
- LRESULT res;
- if (lastMessageContext->nonClientCalcSizeHandler(msg->hwnd, msg->message,
- msg->wParam, msg->lParam, &res)) {
- *result = decltype(*result)(res);
- return true;
+ switch (msg->message) {
+ case WM_NCCALCSIZE: {
+ // https://github.com/qt/qtbase/blob/e26a87f1ecc40bc8c6aa5b889fce67410a57a702/src/plugins/platforms/windows/qwindowscontext.cpp#L1546
+ // Qt needs to refer to the WM_NCCALCSIZE message data that hasn't been
+ // processed, so we have to process it after Qt acquires the initial data.
+ if (lastMessageContext) {
+ LRESULT res;
+ if (lastMessageContext->nonClientCalcSizeHandler(
+ msg->hwnd, msg->message, msg->wParam, msg->lParam, &res)) {
+ *result = decltype(*result)(res);
+ return true;
+ }
+ }
+ break;
}
+
+ // case WM_NCHITTEST: {
+ // // The child window must return HTTRANSPARENT when processing
+ // WM_NCHITTEST for
+ // // the parent window to receive WM_NCHITTEST.
+ // if (!lastMessageContext) {
+ // auto rootHWnd = ::GetAncestor(msg->hwnd, GA_ROOT);
+ // if (rootHWnd != msg->hwnd) {
+ // if (auto ctx = g_wndProcHash->value(rootHWnd)) {
+ // *result = HTTRANSPARENT;
+ // return true;
+ // }
+ // }
+ // }
+ // break;
+ // }
}
return false;
}
@@ -477,18 +611,24 @@
return ::DefWindowProcW(hWnd, message, wParam, lParam);
}
+ WindowsNativeEventFilter::lastMessageContext = ctx;
+ const auto &contextCleaner = qScopeGuard([]() {
+ WindowsNativeEventFilter::lastMessageContext = nullptr; //
+ });
+
// Since Qt does the necessary processing of the WM_NCCALCSIZE message, we need to
// forward it right away and process it in our native event filter.
if (message == WM_NCCALCSIZE) {
- WindowsNativeEventFilter::lastMessageContext = ctx;
- LRESULT result = ::CallWindowProcW(g_qtWindowProc, hWnd, message, wParam, lParam);
- WindowsNativeEventFilter::lastMessageContext = nullptr;
- return result;
+ return ::CallWindowProcW(g_qtWindowProc, hWnd, message, wParam, lParam);
}
// Try hooked procedure and save result
LRESULT result;
if (ctx->windowProc(hWnd, message, wParam, lParam, &result)) {
+ // Forward the event to user-defined native event filters, there may be some messages
+ // that need to be processed by the user.
+ std::ignore =
+ forwardFilteredEvent(ctx->window(), hWnd, message, wParam, lParam, &result);
return result;
}
@@ -497,18 +637,10 @@
}
static inline void addManagedWindow(QWindow *window, HWND hWnd, Win32WindowContext *ctx) {
- const auto margins = [hWnd]() -> QMargins {
- const auto titleBarHeight = int(getTitleBarHeight(hWnd));
- if (isSystemBorderEnabled()) {
- return {0, -titleBarHeight, 0, 0};
- } else {
- const auto frameSize = int(getResizeBorderThickness(hWnd));
- return {-frameSize, -titleBarHeight, -frameSize, -frameSize};
- }
- }();
-
- // Inform Qt we want and have set custom margins
- setInternalWindowFrameMargins(window, margins);
+ if (isSystemBorderEnabled()) {
+ // Inform Qt we want and have set custom margins
+ setInternalWindowFrameMargins(window, QMargins(0, -int(getTitleBarHeight(hWnd)), 0, 0));
+ }
// Store original window proc
if (!g_qtWindowProc) {
@@ -567,12 +699,12 @@
auto hWnd = reinterpret_cast<HWND>(m_windowId);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
const QPoint nativeGlobalPos =
- QHighDpi::toNativeGlobalPosition(pos, m_windowHandle);
+ QHighDpi::toNativeGlobalPosition(pos, m_windowHandle.data());
#else
- const QPoint nativeGlobalPos = QHighDpi::toNativePixels(pos, m_windowHandle);
+ const QPoint nativeGlobalPos = QHighDpi::toNativePixels(pos, m_windowHandle.data());
#endif
- showSystemMenu2(hWnd, qpoint2point(nativeGlobalPos), false,
- m_delegate->isHostSizeFixed(m_host));
+ std::ignore = showSystemMenu_sys(hWnd, qpoint2point(nativeGlobalPos), false,
+ m_delegate->isHostSizeFixed(m_host));
return;
}
@@ -631,7 +763,7 @@
}
case DrawWindows10BorderHook2: {
- if (!m_windowHandle)
+ if (!m_windowId)
return;
// https://github.com/microsoft/terminal/blob/71a6f26e6ece656084e87de1a528c4a8072eeabd/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp#L1025
@@ -663,7 +795,7 @@
QVariant Win32WindowContext::windowAttribute(const QString &key) const {
if (key == QStringLiteral("window-rect")) {
- if (!m_windowHandle)
+ if (!m_windowId)
return {};
RECT frame{};
@@ -686,21 +818,30 @@
}
if (key == QStringLiteral("border-thickness")) {
- return m_windowHandle
+ return m_windowId
? int(getWindowFrameBorderThickness(reinterpret_cast<HWND>(m_windowId)))
: 0;
}
-
return AbstractWindowContext::windowAttribute(key);
}
void Win32WindowContext::winIdChanged(WId winId, WId oldWinId) {
+ // Reset the context data
+ mouseLeaveBlocked = false;
+ lastHitTestResult = WindowPart::Outside;
+ lastHitTestResultRaw = HTNOWHERE;
+
+ if (!isSystemBorderEnabled()) {
+ m_delegate->setWindowFlags(m_host, m_delegate->getWindowFlags(m_host) |
+ Qt::FramelessWindowHint);
+ }
+
// If the original window id is valid, remove all resources related
if (oldWinId) {
removeManagedWindow(reinterpret_cast<HWND>(oldWinId));
}
- if (!m_windowHandle || ! winId) {
+ if (!winId) {
return;
}
@@ -735,15 +876,11 @@
LRESULT *result) {
*result = FALSE;
- if (message == WM_DESTROY) {
- qDebug() << "WM_DESTROY";
- }
-
// We should skip these messages otherwise we will get crashes.
// NOTE: WM_QUIT won't be posted to the WindowProc function.
switch (message) {
- case WM_CLOSE:
case WM_DESTROY:
+ case WM_CLOSE:
case WM_NCDESTROY:
// Undocumented messages:
case WM_UAHDESTROYWINDOW:
@@ -755,20 +892,6 @@
if (!isValidWindow(hWnd, false, true)) {
return false;
- }
-
- switch (message) {
- case WM_NCMOUSELEAVE:
- qDebug() << "WM_NCMOUSELEAVE" << mouseLeaveBlocked;
- break;
- case WM_MOUSEHOVER:
- qDebug() << "WM_MOUSEHOVER" << mouseLeaveBlocked;
- break;
- case WM_NCMOUSEHOVER:
- qDebug() << "WM_NCMOUSEHOVER" << mouseLeaveBlocked;
- break;
- default:
- break;
}
// Test snap layout
@@ -788,13 +911,9 @@
// Forward to native event filter subscribers
if (!m_nativeEventFilters.isEmpty()) {
- MSG msg;
- msg.hwnd = hWnd;
- msg.message = message;
- msg.wParam = wParam;
- msg.lParam = lParam;
+ MSG msg = createMessageBlock(hWnd, message, wParam, lParam);
QT_NATIVE_EVENT_RESULT_TYPE res = 0;
- if (nativeDispatch(QByteArrayLiteral("windows_generic_MSG"), &msg, &res)) {
+ if (nativeDispatch(nativeEventType(), &msg, &res)) {
*result = LRESULT(res);
return true;
}
@@ -1144,7 +1263,7 @@
POINT screenPoint{GET_X_LPARAM(dwScreenPos), GET_Y_LPARAM(dwScreenPos)};
::ScreenToClient(hWnd, &screenPoint);
QPoint qtScenePos = QHighDpi::fromNativeLocalPosition(point2qpoint(screenPoint),
- m_windowHandle);
+ m_windowHandle.data());
auto dummy = WindowAgentBase::Unknown;
if (isInSystemButtons(qtScenePos, &dummy)) {
// We must record whether the last WM_MOUSELEAVE was filtered, because if
@@ -1156,8 +1275,6 @@
}
}
mouseLeaveBlocked = false;
-
- qDebug() << "WM_MOUSELEAVE";
break;
}
@@ -1166,7 +1283,6 @@
// we unset `mouseLeaveBlocked` mark and pretend as if Qt has received
// WM_MOUSELEAVE.
if (lastHitTestResult != WindowPart::ChromeButton && mouseLeaveBlocked) {
- qDebug() << lastHitTestResult << "Track";
mouseLeaveBlocked = false;
requestForMouseLeaveMessage(hWnd, false);
}
@@ -1192,9 +1308,8 @@
case WM_NCPOINTERUP:
#endif
case WM_NCMOUSEHOVER: {
- const WindowPart currentWindowPart = lastHitTestResult;
if (message == WM_NCMOUSEMOVE) {
- if (currentWindowPart != WindowPart::ChromeButton) {
+ if (lastHitTestResult != WindowPart::ChromeButton) {
// https://github.com/qt/qtbase/blob/e26a87f1ecc40bc8c6aa5b889fce67410a57a702/src/widgets/kernel/qwidgetwindow.cpp#L472
// When the mouse press event arrives, QWidgetWindow will implicitly grab
// the top widget right under the mouse, and set `qt_button_down` to this
@@ -1243,29 +1358,60 @@
// the above problems would not arise.
m_delegate->resetQtGrabbedControl(m_host);
+
+ // If the mouse moves from chrome buttons to other non-client areas, a
+ // WM_MOUSELEAVE message should be sent.
if (mouseLeaveBlocked) {
emulateClientAreaMessage(hWnd, message, wParam, lParam,
WM_NCMOUSELEAVE);
}
}
-
- // We need to make sure we get the right hit-test result when a WM_NCMOUSELEAVE
- // comes, so we reset it when we receive a WM_NCMOUSEMOVE.
-
- // If the mouse is entering the client area, there must be a WM_NCHITTEST
- // setting it to `Client` before the WM_NCMOUSELEAVE comes; if the mouse is
- // leaving the window, current window part remains as `Outside`.
- // lastHitTestResult = WindowPart::Outside;
}
- if (currentWindowPart == WindowPart::ChromeButton) {
- emulateClientAreaMessage(hWnd, message, wParam, lParam);
+ if (lastHitTestResult == WindowPart::ChromeButton) {
if (message == WM_NCMOUSEMOVE) {
// ### FIXME FIXME FIXME
// ### FIXME: Calling DefWindowProc() here is really dangerous, investigate
// how to avoid doing this.
// ### FIXME FIXME FIXME
*result = ::DefWindowProcW(hWnd, WM_NCMOUSEMOVE, wParam, lParam);
+ emulateClientAreaMessage(hWnd, message, wParam, lParam);
+ return true;
+ }
+
+ if (lastHitTestResultRaw == HTSYSMENU) {
+ switch (message) {
+ case WM_NCLBUTTONDOWN:
+ if (iconButtonClickLevel == 0) {
+ // A message of WM_SYSCOMMAND with SC_MOUSEMENU will be sent by
+ // Windows, and the current control flow will be blocked by the
+ // menu while Windows will create and execute a new event loop
+ // until the menu returns
+ iconButtonClickTime = ::GetTickCount64();
+ *result = ::DefWindowProcW(hWnd, message, wParam, lParam);
+ iconButtonClickTime = 0;
+ if (iconButtonClickLevel & IconButtonTriggersClose) {
+ ::PostMessageW(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0);
+ }
+ if (iconButtonClickLevel & IconButtonDoubleClicked) {
+ iconButtonClickLevel = 0;
+ }
+ // Otherwise, no need to reset `iconButtonClickLevel` if not to
+ // close, if it has value, there must be another incoming
+ // WM_NCLBUTTONDOWN
+ } else {
+ iconButtonClickLevel = 0;
+ }
+ break;
+ case WM_NCLBUTTONDBLCLK:
+ // A message of WM_SYSCOMMAND with SC_CLOSE will be sent by Windows
+ *result = ::DefWindowProcW(hWnd, message, wParam, lParam);
+ break;
+ default:
+ *result = FALSE;
+ emulateClientAreaMessage(hWnd, message, wParam, lParam);
+ break;
+ }
} else {
// According to MSDN, we should return non-zero for X button messages to
// indicate we have handled these messages (due to historical reasons), for
@@ -1274,6 +1420,7 @@
(((message >= WM_NCXBUTTONDOWN) && (message <= WM_NCXBUTTONDBLCLK))
? TRUE
: FALSE);
+ emulateClientAreaMessage(hWnd, message, wParam, lParam);
}
return true;
}
@@ -1287,7 +1434,7 @@
// pressing area as HTCLIENT which maybe because of our former retransmission of
// WM_NCLBUTTONDOWN, as a result, a WM_NCMOUSELEAVE will come immediately and a
// lot of WM_MOUSEMOVE will come if we move the mouse, we should track the mouse
- // in advance.
+ // in advance. (May be redundant?)
if (mouseLeaveBlocked) {
mouseLeaveBlocked = false;
requestForMouseLeaveMessage(hWnd, false);
@@ -1403,7 +1550,8 @@
// 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)); //
+ lastHitTestResultRaw = int(*result);
+ lastHitTestResult = getHitWindowPart(lastHitTestResultRaw);
});
POINT nativeGlobalPos{GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)};
@@ -1415,8 +1563,8 @@
auto clientWidth = RECT_WIDTH(clientRect);
auto clientHeight = RECT_HEIGHT(clientRect);
- QPoint qtScenePos =
- QHighDpi::fromNativeLocalPosition(point2qpoint(nativeLocalPos), m_windowHandle);
+ QPoint qtScenePos = QHighDpi::fromNativeLocalPosition(point2qpoint(nativeLocalPos),
+ m_windowHandle.data());
bool isFixedSize = m_delegate->isHostSizeFixed(m_host);
bool isTitleBar = isInTitleBarDraggableArea(qtScenePos);
@@ -1952,12 +2100,16 @@
bool shouldShowSystemMenu = false;
bool broughtByKeyboard = false;
POINT nativeGlobalPos{};
+
switch (message) {
case WM_RBUTTONUP: {
const POINT nativeLocalPos = getNativePosFromMouse();
- const QPoint qtScenePos =
- QHighDpi::fromNativeLocalPosition(point2qpoint(nativeLocalPos), m_windowHandle);
- if (isInTitleBarDraggableArea(qtScenePos)) {
+ const QPoint qtScenePos = QHighDpi::fromNativeLocalPosition(
+ point2qpoint(nativeLocalPos), m_windowHandle.data());
+ WindowAgentBase::SystemButton sysButtonType = WindowAgentBase::Unknown;
+ if (isInTitleBarDraggableArea(qtScenePos) ||
+ (isInSystemButtons(qtScenePos, &sysButtonType) &&
+ sysButtonType == WindowAgentBase::WindowIcon)) {
shouldShowSystemMenu = true;
nativeGlobalPos = nativeLocalPos;
::ClientToScreen(hWnd, &nativeGlobalPos);
@@ -1973,10 +2125,20 @@
}
case WM_SYSCOMMAND: {
const WPARAM filteredWParam = (wParam & 0xFFF0);
- if ((filteredWParam == SC_KEYMENU) && (lParam == VK_SPACE)) {
- shouldShowSystemMenu = true;
- broughtByKeyboard = true;
- nativeGlobalPos = getNativeGlobalPosFromKeyboard();
+ switch (filteredWParam) {
+ case SC_MOUSEMENU:
+ shouldShowSystemMenu = true;
+ nativeGlobalPos = getNativeGlobalPosFromKeyboard();
+ break;
+ case SC_KEYMENU:
+ if (lParam == VK_SPACE) {
+ shouldShowSystemMenu = true;
+ broughtByKeyboard = true;
+ nativeGlobalPos = getNativeGlobalPosFromKeyboard();
+ }
+ break;
+ default:
+ break;
}
break;
}
@@ -1995,8 +2157,86 @@
break;
}
if (shouldShowSystemMenu) {
- showSystemMenu2(hWnd, nativeGlobalPos, broughtByKeyboard,
- m_delegate->isHostSizeFixed(m_host));
+ static HHOOK mouseHook = nullptr;
+ static std::optional<POINT> mouseClickPos;
+ static bool mouseDoubleClicked = false;
+ bool mouseHookedLocal = false;
+
+ // The menu is triggered by a click on icon button
+ if (iconButtonClickTime > 0) {
+ POINT menuPos{0, static_cast<LONG>(getTitleBarHeight(hWnd))};
+ if (const auto tb = titleBar()) {
+ auto titleBarHeight = qreal(m_delegate->mapGeometryToScene(tb).height());
+ titleBarHeight *= m_windowHandle->devicePixelRatio();
+ menuPos.y = qRound(titleBarHeight);
+ }
+ ::ClientToScreen(hWnd, &menuPos);
+ nativeGlobalPos = menuPos;
+
+ // Install mouse hook
+ if (!mouseHook) {
+ mouseHook = ::SetWindowsHookExW(
+ WH_MOUSE,
+ [](int nCode, WPARAM wParam, LPARAM lParam) {
+ if (nCode >= 0) {
+ switch (wParam) {
+ case WM_LBUTTONDBLCLK:
+ mouseDoubleClicked = true;
+ Q_FALLTHROUGH();
+
+ // case WM_POINTERDOWN:
+
+ case WM_LBUTTONDOWN: {
+ auto pMouseStruct =
+ reinterpret_cast<MOUSEHOOKSTRUCT *>(lParam);
+ if (pMouseStruct) {
+ mouseClickPos = pMouseStruct->pt;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+ }
+ return ::CallNextHookEx(nullptr, nCode, wParam, lParam);
+ },
+ nullptr, ::GetCurrentThreadId());
+ mouseHookedLocal = true;
+ }
+ }
+
+ bool res = showSystemMenu_sys(hWnd, nativeGlobalPos, broughtByKeyboard,
+ m_delegate->isHostSizeFixed(m_host));
+
+ // Uninstall mouse hook and check if it's a double-click
+ if (mouseHookedLocal) {
+ ::UnhookWindowsHookEx(mouseHook);
+
+ // Emulate the Windows icon button's behavior
+ if (!res && mouseClickPos.has_value()) {
+ POINT nativeLocalPos = mouseClickPos.value();
+ ::ScreenToClient(hWnd, &nativeLocalPos);
+ QPoint qtScenePos = QHighDpi::fromNativeLocalPosition(
+ point2qpoint(nativeLocalPos), m_windowHandle.data());
+ WindowAgentBase::SystemButton sysButtonType = WindowAgentBase::Unknown;
+ if (isInSystemButtons(qtScenePos, &sysButtonType) &&
+ sysButtonType == WindowAgentBase::WindowIcon) {
+ iconButtonClickLevel |= IconButtonClicked;
+ if (::GetTickCount64() - iconButtonClickTime <= ::GetDoubleClickTime()) {
+ iconButtonClickLevel |= IconButtonTriggersClose;
+ }
+ }
+ }
+
+ if (mouseDoubleClicked) {
+ iconButtonClickLevel |= IconButtonDoubleClicked;
+ }
+
+ mouseHook = nullptr;
+ mouseClickPos.reset();
+ mouseDoubleClicked = false;
+ }
+
// QPA's internal code will handle system menu events separately, and its
// behavior is not what we would want to see because it doesn't know our
// window doesn't have any window frame now, so return early here to avoid
--
Gitblit v1.9.1