From 3a5e5aea06e87710e24db0d7439ab81e3e3d301f Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周六, 09 12月 2023 17:24:04 +0800
Subject: [PATCH] fix system menu
---
src/core/contexts/win32windowcontext.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index 329c052..72f20e0 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -476,7 +476,7 @@
}
::SetMenuDefaultItem(hMenu, defaultItemId.value_or(UINT_MAX), FALSE);
- ::DrawMenuBar(hWnd);
+ //::DrawMenuBar(hWnd);
// Popup the system menu at the required position.
const auto result = ::TrackPopupMenu(hMenu, (TPM_RETURNCMD | (QGuiApplication::isRightToLeft() ? TPM_RIGHTALIGN : TPM_LEFTALIGN)), pos.x, pos.y, 0, hWnd, nullptr);
@@ -1311,9 +1311,9 @@
const bool isBottom = (nativeLocalPos.y >= (clientHeight - frameSize));
// Make the border a little wider to let the user easy to resize on corners.
const auto scaleFactor = ((isTop || isBottom) ? qreal(2) : qreal(1));
- const int scaledFrameSizeX = std::round(qreal(frameSize) * scaleFactor);
- const bool isLeft = (nativeLocalPos.x < scaledFrameSizeX);
- const bool isRight = (nativeLocalPos.x >= (clientWidth - scaledFrameSizeX));
+ const int scaledFrameSize = std::round(qreal(frameSize) * scaleFactor);
+ const bool isLeft = (nativeLocalPos.x < scaledFrameSize);
+ const bool isRight = (nativeLocalPos.x >= (clientWidth - scaledFrameSize));
if (dontOverrideCursor && (isTop || isBottom || isLeft || isRight)) {
// Return HTCLIENT instead of HTBORDER here, because the mouse is
// inside the window now, return HTCLIENT to let the controls
--
Gitblit v1.9.1