From abdad66bae077da6c3480db457beb47df5eda813 Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周六, 16 12月 2023 19:27:16 +0800
Subject: [PATCH] Fix mac window mistakes
---
src/core/contexts/win32windowcontext.cpp | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index 0f7b6f7..0f5b7c7 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -114,6 +114,7 @@
DYNAMIC_API_DECLARE(DwmIsCompositionEnabled);
DYNAMIC_API_DECLARE(DwmGetCompositionTimingInfo);
DYNAMIC_API_DECLARE(DwmGetWindowAttribute);
+ DYNAMIC_API_DECLARE(DwmSetWindowAttribute);
DYNAMIC_API_DECLARE(GetDpiForWindow);
DYNAMIC_API_DECLARE(GetSystemMetricsForDpi);
DYNAMIC_API_DECLARE(GetDpiForMonitor);
@@ -140,6 +141,7 @@
DYNAMIC_API_RESOLVE(dwmapi, DwmIsCompositionEnabled);
DYNAMIC_API_RESOLVE(dwmapi, DwmGetCompositionTimingInfo);
DYNAMIC_API_RESOLVE(dwmapi, DwmGetWindowAttribute);
+ DYNAMIC_API_RESOLVE(dwmapi, DwmSetWindowAttribute);
QSystemLibrary winmm(QStringLiteral("winmm"));
DYNAMIC_API_RESOLVE(winmm, timeGetDevCaps);
@@ -800,7 +802,12 @@
case ShowSystemMenuHook: {
const auto &pos = *static_cast<const QPoint *>(data);
auto hWnd = reinterpret_cast<HWND>(m_windowHandle->winId());
- showSystemMenu2(hWnd, qpoint2point(QHighDpi::toNativeGlobalPosition(pos, m_windowHandle)), false,
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ const QPoint nativeGlobalPos = QHighDpi::toNativeGlobalPosition(pos, m_windowHandle);
+#else
+ const QPoint nativeGlobalPos = QHighDpi::toNativePixels(pos, m_windowHandle);
+#endif
+ showSystemMenu2(hWnd, qpoint2point(nativeGlobalPos), false,
m_delegate->isHostSizeFixed(m_host));
return;
}
@@ -876,6 +883,13 @@
auto winId = m_windowHandle->winId();
auto hWnd = reinterpret_cast<HWND>(winId);
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
+ for (const auto attr : { _DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1, _DWMWA_USE_IMMERSIVE_DARK_MODE }) {
+ const BOOL enable = TRUE;
+ DynamicApis::instance().pDwmSetWindowAttribute(hWnd, attr, &enable, sizeof(enable));
+ }
+#endif
+
// Inform Qt we want and have set custom margins
updateInternalWindowFrameMargins(hWnd, m_windowHandle);
--
Gitblit v1.9.1