From 85e783997ffd9629cdaef44b7d482f23c8ca49cb Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周三, 08 5月 2024 21:10:52 +0800
Subject: [PATCH] improve qml demo
---
src/core/contexts/win32windowcontext.cpp | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index e32142e..a75efe7 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -699,9 +699,9 @@
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
std::ignore = showSystemMenu_sys(hWnd, qpoint2point(nativeGlobalPos), false,
m_delegate->isHostSizeFixed(m_host));
@@ -1263,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
@@ -1389,6 +1389,7 @@
// until the menu returns
iconButtonClickTime = ::GetTickCount64();
*result = ::DefWindowProcW(hWnd, message, wParam, lParam);
+ iconButtonClickTime = 0;
if (iconButtonClickLevel & IconButtonTriggersClose) {
::PostMessageW(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0);
}
@@ -1562,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);
@@ -2103,9 +2104,12 @@
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);
@@ -2209,17 +2213,16 @@
::UnhookWindowsHookEx(mouseHook);
// Emulate the Windows icon button's behavior
- static uint32_t doubleClickTime = ::GetDoubleClickTime();
if (!res && mouseClickPos.has_value()) {
POINT nativeLocalPos = mouseClickPos.value();
::ScreenToClient(hWnd, &nativeLocalPos);
QPoint qtScenePos = QHighDpi::fromNativeLocalPosition(
- point2qpoint(nativeLocalPos), m_windowHandle);
+ point2qpoint(nativeLocalPos), m_windowHandle.data());
WindowAgentBase::SystemButton sysButtonType = WindowAgentBase::Unknown;
if (isInSystemButtons(qtScenePos, &sysButtonType) &&
sysButtonType == WindowAgentBase::WindowIcon) {
iconButtonClickLevel |= IconButtonClicked;
- if (::GetTickCount64() - iconButtonClickTime <= doubleClickTime) {
+ if (::GetTickCount64() - iconButtonClickTime <= ::GetDoubleClickTime()) {
iconButtonClickLevel |= IconButtonTriggersClose;
}
}
--
Gitblit v1.9.1