From 6b2d31247dc2c2804e571b31a71c8a423c1db9d4 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 26 12月 2023 01:44:03 +0800
Subject: [PATCH] Totally fix top border issue on Win10 for QtWidgets
---
src/core/shared/qwkwindowsextra_p.h | 100 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 98 insertions(+), 2 deletions(-)
diff --git a/src/core/shared/qwkwindowsextra_p.h b/src/core/shared/qwkwindowsextra_p.h
index baddc07..8ada487 100644
--- a/src/core/shared/qwkwindowsextra_p.h
+++ b/src/core/shared/qwkwindowsextra_p.h
@@ -132,7 +132,24 @@
};
using PWINDOWCOMPOSITIONATTRIBDATA = WINDOWCOMPOSITIONATTRIBDATA *;
+ enum PREFERRED_APP_MODE
+ {
+ PAM_DEFAULT = 0, // Default behavior on systems before Win10 1809. It indicates the application doesn't support dark mode at all.
+ PAM_AUTO = 1, // Available since Win10 1809, let system decide whether to enable dark mode or not.
+ PAM_DARK = 2, // Available since Win10 1903, force dark mode regardless of the system theme.
+ PAM_LIGHT = 3, // Available since Win10 1903, force light mode regardless of the system theme.
+ PAM_MAX = 4
+ };
+
using SetWindowCompositionAttributePtr = BOOL(WINAPI *)(HWND, PWINDOWCOMPOSITIONATTRIBDATA);
+
+ // Win10 1809 (10.0.17763)
+ using RefreshImmersiveColorPolicyStatePtr = VOID(WINAPI *)(VOID); // Ordinal 104
+ using AllowDarkModeForWindowPtr = BOOL(WINAPI *)(HWND, BOOL); // Ordinal 133
+ using AllowDarkModeForAppPtr = BOOL(WINAPI *)(BOOL); // Ordinal 135
+ using FlushMenuThemesPtr = VOID(WINAPI *)(VOID); // Ordinal 136
+ // Win10 1903 (10.0.18362)
+ using SetPreferredAppModePtr = PREFERRED_APP_MODE(WINAPI *)(PREFERRED_APP_MODE); // Ordinal 135
namespace {
@@ -161,6 +178,11 @@
#undef DYNAMIC_API_DECLARE
SetWindowCompositionAttributePtr pSetWindowCompositionAttribute = nullptr;
+ RefreshImmersiveColorPolicyStatePtr pRefreshImmersiveColorPolicyState = nullptr;
+ AllowDarkModeForWindowPtr pAllowDarkModeForWindow = nullptr;
+ AllowDarkModeForAppPtr pAllowDarkModeForApp = nullptr;
+ FlushMenuThemesPtr pFlushMenuThemes = nullptr;
+ SetPreferredAppModePtr pSetPreferredAppMode = nullptr;
private:
DynamicApis() {
@@ -190,6 +212,18 @@
DYNAMIC_API_RESOLVE(winmm, timeEndPeriod);
#undef DYNAMIC_API_RESOLVE
+
+#define UNDOC_API_RESOLVE(DLL, NAME, ORDINAL) \
+ p##NAME = reinterpret_cast<decltype(p##NAME)>(DLL.resolve(MAKEINTRESOURCEA(ORDINAL)))
+
+ QSystemLibrary uxtheme(QStringLiteral("uxtheme"));
+ UNDOC_API_RESOLVE(uxtheme, RefreshImmersiveColorPolicyState, 104);
+ UNDOC_API_RESOLVE(uxtheme, AllowDarkModeForWindow, 133);
+ UNDOC_API_RESOLVE(uxtheme, AllowDarkModeForApp, 135);
+ UNDOC_API_RESOLVE(uxtheme, FlushMenuThemes, 136);
+ UNDOC_API_RESOLVE(uxtheme, SetPreferredAppMode, 135);
+
+#undef UNDOC_API_RESOLVE
}
~DynamicApis() = default;
@@ -268,6 +302,15 @@
LONG(qrect.bottom())};
}
+ static inline constexpr QMargins margins2qmargins(const MARGINS &margins) {
+ return {margins.cxLeftWidth, margins.cyTopHeight, margins.cxRightWidth,
+ margins.cyBottomHeight};
+ }
+
+ static inline constexpr MARGINS qmargins2margins(const QMargins &qmargins) {
+ return MARGINS{qmargins.left(), qmargins.right(), qmargins.top(), qmargins.bottom()};
+ }
+
static inline /*constexpr*/ QString hwnd2str(const WId windowId) {
// NULL handle is allowed here.
return QLatin1String("0x") +
@@ -296,6 +339,11 @@
static inline bool isWin101809OrGreater() {
static const bool result = IsWindows101809OrGreater_Real();
+ return result;
+ }
+
+ static inline bool isWin101903OrGreater() {
+ static const bool result = IsWindows101903OrGreater_Real();
return result;
}
@@ -367,9 +415,8 @@
_DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1,
&enabled, sizeof(enabled)))) {
return enabled;
- } else {
- return false;
}
+ return false;
}
static inline QColor getAccentColor() {
@@ -394,6 +441,55 @@
#endif
}
+ static inline quint32 getDpiForWindow(HWND hwnd) {
+ const DynamicApis &apis = DynamicApis::instance();
+ if (apis.pGetDpiForWindow) { // Win10
+ return apis.pGetDpiForWindow(hwnd);
+ } else if (apis.pGetDpiForMonitor) { // Win8.1
+ HMONITOR monitor = ::MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
+ UINT dpiX{0};
+ UINT dpiY{0};
+ apis.pGetDpiForMonitor(monitor, MDT_EFFECTIVE_DPI, &dpiX, &dpiY);
+ return dpiX;
+ } else { // Win2K
+ HDC hdc = ::GetDC(nullptr);
+ const int dpiX = ::GetDeviceCaps(hdc, LOGPIXELSX);
+ // const int dpiY = ::GetDeviceCaps(hdc, LOGPIXELSY);
+ ::ReleaseDC(nullptr, hdc);
+ return quint32(dpiX);
+ }
+ }
+
+ static inline quint32 getSystemMetricsForDpi(int index, quint32 dpi) {
+ const DynamicApis &apis = DynamicApis::instance();
+ if (apis.pGetSystemMetricsForDpi) {
+ return ::GetSystemMetricsForDpi(index, dpi);
+ }
+ return ::GetSystemMetrics(index);
+ }
+
+ static inline quint32 getWindowFrameBorderThickness(HWND hwnd) {
+ const DynamicApis &apis = DynamicApis::instance();
+ if (UINT result = 0; SUCCEEDED(apis.pDwmGetWindowAttribute(
+ hwnd, _DWMWA_VISIBLE_FRAME_BORDER_THICKNESS, &result, sizeof(result)))) {
+ return result;
+ }
+ return getSystemMetricsForDpi(SM_CXBORDER, getDpiForWindow(hwnd));
+ }
+
+ static inline quint32 getResizeBorderThickness(HWND hwnd) {
+ const quint32 dpi = getDpiForWindow(hwnd);
+ return getSystemMetricsForDpi(SM_CXSIZEFRAME, dpi) +
+ getSystemMetricsForDpi(SM_CXPADDEDBORDER, dpi);
+ }
+
+ static inline quint32 getTitleBarHeight(HWND hwnd) {
+ const quint32 dpi = getDpiForWindow(hwnd);
+ return getSystemMetricsForDpi(SM_CYCAPTION, dpi) +
+ getSystemMetricsForDpi(SM_CXSIZEFRAME, dpi) +
+ getSystemMetricsForDpi(SM_CXPADDEDBORDER, dpi);
+ }
+
}
#endif // QWKWINDOWSEXTRA_P_H
--
Gitblit v1.9.1