From baaefab217758ffe51322ad16b6f12a05228db8c Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周六, 30 12月 2023 17:49:00 +0800
Subject: [PATCH] wip
---
src/core/contexts/win32windowcontext.cpp | 70 +++++++++++++++++++----------------
1 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index bf25bdb..17a42c1 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -9,7 +9,6 @@
#include <QtGui/QGuiApplication>
#include <QtGui/QPainter>
#include <QtGui/QPalette>
-#include <QtGui/QStyleHints>
#include <QtGui/private/qhighdpiscaling_p.h>
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
@@ -47,13 +46,13 @@
static WNDPROC g_qtWindowProc = nullptr;
static inline bool
-#if !QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+#if !QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
constexpr
#endif
isSystemBorderEnabled() {
return
-#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
isWin10OrGreater()
#else
false
@@ -402,8 +401,8 @@
return false;
}
- static WindowsNativeEventFilter *instance;
- static Win32WindowContext *lastMessageContext;
+ static inline WindowsNativeEventFilter *instance = nullptr;
+ static inline Win32WindowContext *lastMessageContext = nullptr;
static inline void install() {
if (instance) {
@@ -420,9 +419,6 @@
instance = nullptr;
}
};
-
- WindowsNativeEventFilter *WindowsNativeEventFilter::instance = nullptr;
- Win32WindowContext *WindowsNativeEventFilter::lastMessageContext = nullptr;
// https://github.com/qt/qtbase/blob/e26a87f1ecc40bc8c6aa5b889fce67410a57a702/src/plugins/platforms/windows/qwindowscontext.cpp#L1025
// We can see from the source code that Qt will filter out some messages first and then send the
@@ -574,6 +570,7 @@
case RaiseWindowHook: {
if (!windowId)
return;
+ m_delegate->setWindowVisible(m_host, true);
const auto hwnd = reinterpret_cast<HWND>(windowId);
bringWindowToFront(hwnd);
return;
@@ -606,7 +603,7 @@
}
case DrawWindows10BorderHook: {
-#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
if (!windowId)
return;
@@ -651,7 +648,7 @@
}
case DrawWindows10BorderHook2: {
-#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
if (!m_windowHandle)
return;
@@ -683,14 +680,22 @@
}
QVariant Win32WindowContext::windowAttribute(const QString &key) const {
- if (key == QStringLiteral("title-bar-rect")) {
+ if (key == QStringLiteral("window-rect")) {
if (!m_windowHandle)
return {};
- auto hwnd = reinterpret_cast<HWND>(windowId);
RECT frame{};
- ::AdjustWindowRectExForDpi(&frame, ::GetWindowLongPtrW(hwnd, GWL_STYLE), FALSE, 0,
- getDpiForWindow(hwnd));
+ auto hwnd = reinterpret_cast<HWND>(windowId);
+ // According to MSDN, WS_OVERLAPPED is not allowed for AdjustWindowRect.
+ auto style = static_cast<DWORD>(::GetWindowLongPtrW(hwnd, GWL_STYLE) & ~WS_OVERLAPPED);
+ auto exStyle = static_cast<DWORD>(::GetWindowLongPtrW(hwnd, GWL_EXSTYLE));
+ const DynamicApis &apis = DynamicApis::instance();
+ if (apis.pAdjustWindowRectExForDpi) {
+ apis.pAdjustWindowRectExForDpi(&frame, style, FALSE, exStyle,
+ getDpiForWindow(hwnd));
+ } else {
+ ::AdjustWindowRectEx(&frame, style, FALSE, exStyle);
+ }
return QVariant::fromValue(rect2qrect(frame));
}
@@ -723,18 +728,24 @@
auto hWnd = reinterpret_cast<HWND>(winId);
if (!isSystemBorderEnabled()) {
- setWindowAttribute(QStringLiteral("extra-margins"),
- QVariant::fromValue(QMargins(1, 1, 1, 1)));
+ static auto margins = QVariant::fromValue(QMargins(1, 1, 1, 1));
+
+ // If we remove the system border, the window will lose its shadow. If dwm is enabled,
+ // then we need to set at least 1px margins, otherwise the following operation will
+ // fail with no effect.
+ setWindowAttribute(QStringLiteral("extra-margins"), margins);
}
+ // We should disable WS_SYSMENU, otherwise the system button icons will be visible if mica
+ // is enabled and the title bar is transparent.
{
auto style = ::GetWindowLongPtrW(hWnd, GWL_STYLE);
-#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
- ::SetWindowLongPtrW(hWnd, GWL_STYLE, style & (~WS_SYSMENU));
-#else
- ::SetWindowLongPtrW(hWnd, GWL_STYLE,
- (style | WS_THICKFRAME | WS_CAPTION) & (~WS_SYSMENU));
-#endif
+ if (isSystemBorderEnabled()) {
+ ::SetWindowLongPtrW(hWnd, GWL_STYLE, style & (~WS_SYSMENU));
+ } else {
+ ::SetWindowLongPtrW(hWnd, GWL_STYLE,
+ (style | WS_THICKFRAME | WS_CAPTION) & (~WS_SYSMENU));
+ }
}
// Add managed window
@@ -812,8 +823,7 @@
if (key == QStringLiteral("extra-margins")) {
auto margins = qmargins2margins(attribute.value<QMargins>());
- DynamicApis::instance().pDwmExtendFrameIntoClientArea(hwnd, &margins);
- return true;
+ return apis.pDwmExtendFrameIntoClientArea(hwnd, &margins) == S_OK;
}
if (key == QStringLiteral("dark-mode")) {
@@ -943,12 +953,9 @@
}
if (key == QStringLiteral("dwm-blur")) {
- // TODO: Optimize
- // Currently not available!!!
if (attribute.toBool()) {
- // We need to extend the window frame into the whole client area to be able
- // to see the blurred window background.
- apis.pDwmExtendFrameIntoClientArea(hwnd, &extendedMargins);
+ // We can't extend the window frame for this effect.
+ restoreMargins();
if (isWin8OrGreater()) {
ACCENT_POLICY policy{};
policy.dwAccentState = ACCENT_ENABLE_BLURBEHIND;
@@ -980,7 +987,6 @@
bb.dwFlags = DWM_BB_ENABLE;
apis.pDwmEnableBlurBehindWindow(hwnd, &bb);
}
- restoreMargins();
}
return true;
}
@@ -1319,12 +1325,12 @@
LPARAM lParam, LRESULT *result) {
switch (message) {
case WM_SHOWWINDOW: {
- if (!centered) {
+ if (!initialCentered) {
// If wParam is TRUE, the window is being shown.
// If lParam is zero, the message was sent because of a call to the ShowWindow
// function.
if (wParam && !lParam) {
- centered = true;
+ initialCentered = true;
moveWindowToDesktopCenter(hWnd);
}
}
--
Gitblit v1.9.1