From db00428f146a7daf2c8b5c4de6c8c1e317f950a4 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周日, 10 12月 2023 23:46:31 +0800
Subject: [PATCH] Fix macro definition mistake
---
src/core/contexts/win32windowcontext.cpp | 206 ++++++++++++++++++++-------------------------------
1 files changed, 80 insertions(+), 126 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index 9581b94..4d08adc 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -25,7 +25,9 @@
#include <timeapi.h>
#include <versionhelpers.h>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Q_DECLARE_METATYPE(QMargins)
+#endif
namespace QWK {
@@ -60,46 +62,42 @@
// }
// };
//
-// #define DWM_API_DECLARE(NAME) decltype(&::NAME) p##NAME = DefaultFunc<decltype(&::NAME)>::func
-#define DWM_API_DECLARE(NAME) decltype(&::NAME) p##NAME = nullptr
+// #define DYNAMIC_API_DECLARE(NAME) decltype(&::NAME) p##NAME = DefaultFunc<decltype(&::NAME)>::func
+#define DYNAMIC_API_DECLARE(NAME) decltype(&::NAME) p##NAME = nullptr
- DWM_API_DECLARE(DwmFlush);
- DWM_API_DECLARE(DwmIsCompositionEnabled);
- DWM_API_DECLARE(DwmGetCompositionTimingInfo);
- DWM_API_DECLARE(GetDpiForWindow);
- DWM_API_DECLARE(GetSystemMetricsForDpi);
- DWM_API_DECLARE(GetDpiForMonitor);
- DWM_API_DECLARE(timeGetDevCaps);
- DWM_API_DECLARE(timeBeginPeriod);
- DWM_API_DECLARE(timeEndPeriod);
+ DYNAMIC_API_DECLARE(DwmFlush);
+ DYNAMIC_API_DECLARE(DwmIsCompositionEnabled);
+ DYNAMIC_API_DECLARE(DwmGetCompositionTimingInfo);
+ DYNAMIC_API_DECLARE(GetDpiForWindow);
+ DYNAMIC_API_DECLARE(GetSystemMetricsForDpi);
+ DYNAMIC_API_DECLARE(GetDpiForMonitor);
+ DYNAMIC_API_DECLARE(timeGetDevCaps);
+ DYNAMIC_API_DECLARE(timeBeginPeriod);
+ DYNAMIC_API_DECLARE(timeEndPeriod);
-#undef DWM_API_DECLARE
+#undef DYNAMIC_API_DECLARE
DynamicApis() {
+#define DYNAMIC_API_RESOLVE(DLL, NAME) p##NAME = reinterpret_cast<decltype(p##NAME)>(DLL.resolve(#NAME))
+
QSystemLibrary user32(QStringLiteral("user32"));
- pGetDpiForWindow =
- reinterpret_cast<decltype(pGetDpiForWindow)>(user32.resolve("GetDpiForWindow"));
- pGetSystemMetricsForDpi = reinterpret_cast<decltype(pGetSystemMetricsForDpi)>(
- user32.resolve("GetSystemMetricsForDpi"));
+ DYNAMIC_API_RESOLVE(user32, GetDpiForWindow);
+ DYNAMIC_API_RESOLVE(user32, GetSystemMetricsForDpi);
QSystemLibrary shcore(QStringLiteral("shcore"));
- pGetDpiForMonitor =
- reinterpret_cast<decltype(pGetDpiForMonitor)>(shcore.resolve("GetDpiForMonitor"));
+ DYNAMIC_API_RESOLVE(shcore, GetDpiForMonitor);
QSystemLibrary dwmapi(QStringLiteral("dwmapi"));
- pDwmFlush = reinterpret_cast<decltype(pDwmFlush)>(dwmapi.resolve("DwmFlush"));
- pDwmIsCompositionEnabled = reinterpret_cast<decltype(pDwmIsCompositionEnabled)>(
- dwmapi.resolve("DwmIsCompositionEnabled"));
- pDwmGetCompositionTimingInfo = reinterpret_cast<decltype(pDwmGetCompositionTimingInfo)>(
- dwmapi.resolve("DwmGetCompositionTimingInfo"));
+ DYNAMIC_API_RESOLVE(dwmapi, DwmFlush);
+ DYNAMIC_API_RESOLVE(dwmapi, DwmIsCompositionEnabled);
+ DYNAMIC_API_RESOLVE(dwmapi, DwmGetCompositionTimingInfo);
QSystemLibrary winmm(QStringLiteral("winmm"));
- ptimeGetDevCaps =
- reinterpret_cast<decltype(ptimeGetDevCaps)>(winmm.resolve("timeGetDevCaps"));
- ptimeBeginPeriod =
- reinterpret_cast<decltype(ptimeBeginPeriod)>(winmm.resolve("timeBeginPeriod"));
- ptimeEndPeriod =
- reinterpret_cast<decltype(ptimeEndPeriod)>(winmm.resolve("timeEndPeriod"));
+ DYNAMIC_API_RESOLVE(winmm, timeGetDevCaps);
+ DYNAMIC_API_RESOLVE(winmm, timeBeginPeriod);
+ DYNAMIC_API_RESOLVE(winmm, timeEndPeriod);
+
+#undef DYNAMIC_API_RESOLVE
}
~DynamicApis() = default;
@@ -289,7 +287,7 @@
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (QPlatformWindow *platformWindow = window->handle()) {
if (const auto ni = QGuiApplication::platformNativeInterface()) {
- ni->setWindowProperty(platformWindow, QStringLiteral("_q_windowsCustomMargins"),
+ ni->setWindowProperty(platformWindow, QStringLiteral("WindowsCustomMargins"),
marginsVar);
}
}
@@ -385,7 +383,7 @@
apis.ptimeEndPeriod(ms_granularity);
}
- static inline void showSystemMenu2(HWND hWnd, const POINT &pos, const bool selectFirstEntry)
+ static inline void showSystemMenu2(HWND hWnd, const POINT &pos, const bool selectFirstEntry, const bool fixedSize)
{
const HMENU hMenu = ::GetSystemMenu(hWnd, FALSE);
if (!hMenu) {
@@ -395,97 +393,46 @@
return;
}
- // Tweak the menu items according to the current window status and user settings.
- const bool disableClose = /*data->callbacks->getProperty(kSysMenuDisableCloseVar, false).toBool()*/false;
- const bool disableRestore = /*data->callbacks->getProperty(kSysMenuDisableRestoreVar, false).toBool()*/false;
- const bool disableMinimize = /*data->callbacks->getProperty(kSysMenuDisableMinimizeVar, false).toBool()*/false;
- const bool disableMaximize = /*data->callbacks->getProperty(kSysMenuDisableMaximizeVar, false).toBool()*/false;
- const bool disableSize = /*data->callbacks->getProperty(kSysMenuDisableSizeVar, false).toBool()*/false;
- const bool disableMove = /*data->callbacks->getProperty(kSysMenuDisableMoveVar, false).toBool()*/false;
- const bool removeClose = /*data->callbacks->getProperty(kSysMenuRemoveCloseVar, false).toBool()*/false;
- const bool removeSeparator = /*data->callbacks->getProperty(kSysMenuRemoveSeparatorVar, false).toBool()*/false;
- const bool removeRestore = /*data->callbacks->getProperty(kSysMenuRemoveRestoreVar, false).toBool()*/false;
- const bool removeMinimize = /*data->callbacks->getProperty(kSysMenuRemoveMinimizeVar, false).toBool()*/false;
- const bool removeMaximize = /*data->callbacks->getProperty(kSysMenuRemoveMaximizeVar, false).toBool()*/false;
- const bool removeSize = /*data->callbacks->getProperty(kSysMenuRemoveSizeVar, false).toBool()*/false;
- const bool removeMove = /*data->callbacks->getProperty(kSysMenuRemoveMoveVar, false).toBool()*/false;
const bool maxOrFull = IsMaximized(hWnd) || isFullScreen(hWnd);
- const bool fixedSize = /*data->callbacks->isWindowFixedSize()*/false;
- if (removeClose) {
- ::DeleteMenu(hMenu, SC_CLOSE, MF_BYCOMMAND);
- } else {
- ::EnableMenuItem(hMenu, SC_CLOSE, (MF_BYCOMMAND | (disableClose ? MFS_DISABLED : MFS_ENABLED)));
- }
- if (removeSeparator) {
- // Looks like we must use 0 for the second parameter here, otherwise we can't remove the separator.
- ::DeleteMenu(hMenu, 0, MFT_SEPARATOR);
- }
- if (removeMaximize) {
- ::DeleteMenu(hMenu, SC_MAXIMIZE, MF_BYCOMMAND);
- } else {
- ::EnableMenuItem(hMenu, SC_MAXIMIZE, (MF_BYCOMMAND | ((maxOrFull || fixedSize || disableMaximize) ? MFS_DISABLED : MFS_ENABLED)));
- }
- if (removeRestore) {
- ::DeleteMenu(hMenu, SC_RESTORE, MF_BYCOMMAND);
- } else {
- ::EnableMenuItem(hMenu, SC_RESTORE, (MF_BYCOMMAND | ((maxOrFull && !fixedSize && !disableRestore) ? MFS_ENABLED : MFS_DISABLED)));
- // The first menu item should be selected by default if the menu is brought
- // up by keyboard. I don't know how to pre-select a menu item but it seems
- // highlight can do the job. However, there's an annoying issue if we do
- // this manually: the highlighted menu item is really only highlighted,
- // not selected, so even if the mouse cursor hovers on other menu items
- // or the user navigates to other menu items through keyboard, the original
- // highlight bar will not move accordingly, the OS will generate another
- // highlight bar to indicate the current selected menu item, which will make
- // the menu look kind of weird. Currently I don't know how to fix this issue.
- ::HiliteMenuItem(hWnd, hMenu, SC_RESTORE, (MF_BYCOMMAND | (selectFirstEntry ? MFS_HILITE : MFS_UNHILITE)));
- }
- if (removeMinimize) {
- ::DeleteMenu(hMenu, SC_MINIMIZE, MF_BYCOMMAND);
- } else {
- ::EnableMenuItem(hMenu, SC_MINIMIZE, (MF_BYCOMMAND | (disableMinimize ? MFS_DISABLED : MFS_ENABLED)));
- }
- if (removeSize) {
- ::DeleteMenu(hMenu, SC_SIZE, MF_BYCOMMAND);
- } else {
- ::EnableMenuItem(hMenu, SC_SIZE, (MF_BYCOMMAND | ((maxOrFull || fixedSize || disableSize || disableMinimize || disableMaximize) ? MFS_DISABLED : MFS_ENABLED)));
- }
- if (removeMove) {
- ::DeleteMenu(hMenu, SC_MOVE, MF_BYCOMMAND);
- } else {
- ::EnableMenuItem(hMenu, SC_MOVE, (MF_BYCOMMAND | ((maxOrFull || disableMove) ? MFS_DISABLED : MFS_ENABLED)));
- }
+ ::EnableMenuItem(hMenu, SC_CLOSE, (MF_BYCOMMAND | MFS_ENABLED));
+ ::EnableMenuItem(hMenu, SC_MAXIMIZE, (MF_BYCOMMAND | ((maxOrFull || fixedSize) ? MFS_DISABLED : MFS_ENABLED)));
+ ::EnableMenuItem(hMenu, SC_RESTORE, (MF_BYCOMMAND | ((maxOrFull && !fixedSize) ? MFS_ENABLED : MFS_DISABLED)));
+ // The first menu item should be selected by default if the menu is brought
+ // up by keyboard. I don't know how to pre-select a menu item but it seems
+ // highlight can do the job. However, there's an annoying issue if we do
+ // this manually: the highlighted menu item is really only highlighted,
+ // not selected, so even if the mouse cursor hovers on other menu items
+ // or the user navigates to other menu items through keyboard, the original
+ // highlight bar will not move accordingly, the OS will generate another
+ // highlight bar to indicate the current selected menu item, which will make
+ // the menu look kind of weird. Currently I don't know how to fix this issue.
+ ::HiliteMenuItem(hWnd, hMenu, SC_RESTORE, (MF_BYCOMMAND | (selectFirstEntry ? MFS_HILITE : MFS_UNHILITE)));
+ ::EnableMenuItem(hMenu, SC_MINIMIZE, (MF_BYCOMMAND | MFS_ENABLED));
+ ::EnableMenuItem(hMenu, SC_SIZE, (MF_BYCOMMAND | ((maxOrFull || fixedSize) ? MFS_DISABLED : MFS_ENABLED)));
+ ::EnableMenuItem(hMenu, SC_MOVE, (MF_BYCOMMAND | (maxOrFull ? MFS_DISABLED : MFS_ENABLED)));
// The default menu item will appear in bold font. There can only be one default
// menu item per menu at most. Set the item ID to "UINT_MAX" (or simply "-1")
// can clear the default item for the given menu.
- std::optional<UINT> defaultItemId = std::nullopt;
+ UINT defaultItemId = UINT_MAX;
if (isWin11OrGreater()) {
if (maxOrFull) {
- if (!removeRestore) {
- defaultItemId = SC_RESTORE;
- }
+ defaultItemId = SC_RESTORE;
} else {
- if (!removeMaximize) {
- defaultItemId = SC_MAXIMIZE;
- }
+ defaultItemId = SC_MAXIMIZE;
}
}
- if (!(defaultItemId.has_value() || removeClose)) {
+ if (defaultItemId == UINT_MAX) {
defaultItemId = SC_CLOSE;
}
- ::SetMenuDefaultItem(hMenu, defaultItemId.value_or(UINT_MAX), FALSE);
-
- ::DrawMenuBar(hWnd);
+ ::SetMenuDefaultItem(hMenu, defaultItemId, FALSE);
// 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);
- if (!removeRestore) {
- // Unhighlight the first menu item after the popup menu is closed, otherwise it will keep
- // highlighting until we unhighlight it manually.
- ::HiliteMenuItem(hWnd, hMenu, SC_RESTORE, (MF_BYCOMMAND | MFS_UNHILITE));
- }
+ // Unhighlight the first menu item after the popup menu is closed, otherwise it will keep
+ // highlighting until we unhighlight it manually.
+ ::HiliteMenuItem(hWnd, hMenu, SC_RESTORE, (MF_BYCOMMAND | MFS_UNHILITE));
if (!result) {
// The user canceled the menu, no need to continue.
@@ -764,10 +711,6 @@
return false;
}
- if (systemMenuHandler(hWnd, message, wParam, lParam, result)) {
- return true;
- }
-
// Test snap layout
if (snapLayoutHandler(hWnd, message, wParam, lParam, result)) {
return true;
@@ -775,6 +718,10 @@
// Main implementation
if (customWindowHandler(hWnd, message, wParam, lParam, result)) {
+ return true;
+ }
+
+ if (systemMenuHandler(hWnd, message, wParam, lParam, result)) {
return true;
}
@@ -937,8 +884,7 @@
DWORD dwScreenPos = ::GetMessagePos();
POINT screenPoint{GET_X_LPARAM(dwScreenPos), GET_Y_LPARAM(dwScreenPos)};
::ScreenToClient(hWnd, &screenPoint);
- QPoint qtScenePos = QHighDpi::fromNativeLocalPosition(
- QPoint{screenPoint.x, screenPoint.y}, m_windowHandle);
+ QPoint qtScenePos = QHighDpi::fromNativeLocalPosition(point2qpoint(screenPoint), m_windowHandle);
auto dummy = CoreWindowAgent::Unknown;
if (isInSystemButtons(qtScenePos, &dummy)) {
// We must record whether the last WM_MOUSELEAVE was filtered, because if
@@ -1170,8 +1116,7 @@
auto clientWidth = RECT_WIDTH(clientRect);
auto clientHeight = RECT_HEIGHT(clientRect);
- QPoint qtScenePos = QHighDpi::fromNativeLocalPosition(
- QPoint(nativeLocalPos.x, nativeLocalPos.y), m_windowHandle);
+ QPoint qtScenePos = QHighDpi::fromNativeLocalPosition(point2qpoint(nativeLocalPos), m_windowHandle);
bool isFixedSize = m_delegate->isHostSizeFixed(m_host);
bool isTitleBar = isInTitleBarDraggableArea(qtScenePos);
@@ -1187,22 +1132,31 @@
// this is also the normal behavior of a native Win32 window (but only when the
// window is not maximized/fullscreen/minimized, of course).
if (isWindowNoState(hWnd)) {
- static constexpr const int kBorderSize = 2;
+ static constexpr const auto kBorderSize = quint8{2};
bool isTop = (nativeLocalPos.y <= kBorderSize);
+ bool isLeft = nativeLocalPos.x <= kBorderSize;
bool isRight = (nativeLocalPos.x >= (clientWidth - kBorderSize));
- if (isTop || isRight) {
+ if (isTop || isLeft || isRight) {
if (dontOverrideCursor) {
// The user doesn't want the window to be resized, so we tell
// Windows we are in the client area so that the controls beneath
// the mouse cursor can still be hovered or clicked.
*result = (isTitleBar ? HTCAPTION : HTCLIENT);
} else {
- if (isTop && isRight) {
- *result = HTTOPRIGHT;
- } else if (isTop) {
- *result = HTTOP;
+ if (isTop) {
+ if (isLeft) {
+ *result = HTTOPLEFT;
+ } else if (isRight) {
+ *result = HTTOPRIGHT;
+ } else {
+ *result = HTTOP;
+ }
} else {
- *result = HTRIGHT;
+ if (isLeft) {
+ *result = HTLEFT;
+ } else {
+ *result = HTRIGHT;
+ }
}
}
}
@@ -1302,9 +1256,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
@@ -1682,7 +1636,7 @@
switch (message) {
case WM_RBUTTONUP: {
const POINT nativeLocalPos = getNativePosFromMouse();
- const QPoint qtScenePos = QHighDpi::fromNativeLocalPosition(QPoint(nativeLocalPos.x, nativeLocalPos.y), m_windowHandle);
+ const QPoint qtScenePos = QHighDpi::fromNativeLocalPosition(point2qpoint(nativeLocalPos), m_windowHandle);
if (isInTitleBarDraggableArea(qtScenePos)) {
shouldShowSystemMenu = true;
nativeGlobalPos = nativeLocalPos;
@@ -1721,7 +1675,7 @@
break;
}
if (shouldShowSystemMenu) {
- showSystemMenu2(hWnd, nativeGlobalPos, broughtByKeyboard);
+ showSystemMenu2(hWnd, nativeGlobalPos, broughtByKeyboard, m_delegate->isHostSizeFixed(m_host));
// 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