From 436e8326effba6678a6a5dc47e94cdded6f3a080 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周五, 22 12月 2023 22:15:56 +0800
Subject: [PATCH] Fix maximize bug
---
src/core/contexts/win32windowcontext.cpp | 55 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index af84241..24dfcd9 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -21,6 +21,8 @@
# include <QtGui/qpa/qplatformwindow_p.h>
#endif
+#include <QWKCore/qwkconfig.h>
+
#include "qwkglobal_p.h"
#include "qwkwindowsextra_p.h"
@@ -55,7 +57,7 @@
static inline quint32 getDpiForWindow(HWND hwnd) {
const DynamicApis &apis = DynamicApis::instance();
- if (apis.pGetDpiForWindow) { // Win10
+ if (apis.pGetDpiForWindow) { // Win10
return apis.pGetDpiForWindow(hwnd);
} else if (apis.pGetDpiForMonitor) { // Win8.1
HMONITOR monitor = ::MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
@@ -712,10 +714,20 @@
auto winId = m_windowHandle->winId();
auto hWnd = reinterpret_cast<HWND>(winId);
- if (!isWin10OrGreater()) {
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+ if (!isWin10OrGreater())
+#endif
+ {
static constexpr const MARGINS margins = {1, 1, 1, 1};
DynamicApis::instance().pDwmExtendFrameIntoClientArea(hWnd, &margins);
}
+
+#if !QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+ {
+ auto style = ::GetWindowLongPtrW(hWnd, GWL_STYLE);
+ ::SetWindowLongPtrW(hWnd, GWL_STYLE, style | WS_THICKFRAME | WS_CAPTION);
+ }
+#endif
#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
for (const auto attr : {
@@ -789,8 +801,11 @@
bool Win32WindowContext::windowAttributeChanged(const QString &key, const QVariant &attribute,
const QVariant &oldAttribute) {
- const auto hwnd = reinterpret_cast<HWND>(window->winId());
+ const auto hwnd = reinterpret_cast<HWND>(m_windowHandle->winId());
const DynamicApis &apis = DynamicApis::instance();
+ static constexpr const MARGINS extendMargins = {-1, -1, -1, -1};
+ static const auto defaultMargins =
+ isWin10OrGreater() ? MARGINS{0, 0, 0, 0} : MARGINS{1, 1, 1, 1};
if (key == QStringLiteral("mica")) {
if (!isWin11OrGreater()) {
return false;
@@ -798,8 +813,7 @@
if (attribute.toBool()) {
// We need to extend the window frame into the whole client area to be able
// to see the blurred window background.
- static constexpr const MARGINS margins = {-1, -1, -1, -1};
- apis.pDwmExtendFrameIntoClientArea(hwnd, &margins);
+ apis.pDwmExtendFrameIntoClientArea(hwnd, &extendMargins);
if (isWin1122H2OrGreater()) {
// Use official DWM API to enable Mica, available since Windows 11 22H2
// (10.0.22621).
@@ -821,8 +835,7 @@
const BOOL enable = FALSE;
apis.pDwmSetWindowAttribute(hwnd, _DWMWA_MICA_EFFECT, &enable, sizeof(enable));
}
- static constexpr const MARGINS margins = {0, 0, 0, 0};
- apis.pDwmExtendFrameIntoClientArea(hwnd, &margins);
+ apis.pDwmExtendFrameIntoClientArea(hwnd, &defaultMargins);
}
return true;
} else if (key == QStringLiteral("mica-alt")) {
@@ -832,8 +845,7 @@
if (attribute.toBool()) {
// We need to extend the window frame into the whole client area to be able
// to see the blurred window background.
- static constexpr const MARGINS margins = {-1, -1, -1, -1};
- apis.pDwmExtendFrameIntoClientArea(hwnd, &margins);
+ apis.pDwmExtendFrameIntoClientArea(hwnd, &extendMargins);
// Use official DWM API to enable Mica Alt, available since Windows 11 22H2
// (10.0.22621).
const _DWM_SYSTEMBACKDROP_TYPE backdropType = _DWMSBT_TABBEDWINDOW;
@@ -843,8 +855,7 @@
const _DWM_SYSTEMBACKDROP_TYPE backdropType = _DWMSBT_AUTO;
apis.pDwmSetWindowAttribute(hwnd, _DWMWA_SYSTEMBACKDROP_TYPE, &backdropType,
sizeof(backdropType));
- static constexpr const MARGINS margins = {0, 0, 0, 0};
- apis.pDwmExtendFrameIntoClientArea(hwnd, &margins);
+ apis.pDwmExtendFrameIntoClientArea(hwnd, &defaultMargins);
}
return true;
} else if (key == QStringLiteral("acrylic-material")) {
@@ -854,8 +865,7 @@
if (attribute.userType() == QMetaType::QColor) {
// We need to extend the window frame into the whole client area to be able
// to see the blurred window background.
- static constexpr const MARGINS margins = {-1, -1, -1, -1};
- apis.pDwmExtendFrameIntoClientArea(hwnd, &margins);
+ apis.pDwmExtendFrameIntoClientArea(hwnd, &extendMargins);
if (isWin11OrGreater()) {
const _DWM_SYSTEMBACKDROP_TYPE backdropType = _DWMSBT_TRANSIENTWINDOW;
apis.pDwmSetWindowAttribute(hwnd, _DWMWA_SYSTEMBACKDROP_TYPE, &backdropType,
@@ -891,16 +901,14 @@
wcad.cbData = sizeof(policy);
apis.pSetWindowCompositionAttribute(hwnd, &wcad);
}
- static constexpr const MARGINS margins = {0, 0, 0, 0};
- apis.pDwmExtendFrameIntoClientArea(hwnd, &margins);
+ apis.pDwmExtendFrameIntoClientArea(hwnd, &defaultMargins);
}
return true;
} else if (key == QStringLiteral("dwm-blur")) {
if (attribute.toBool()) {
// We need to extend the window frame into the whole client area to be able
// to see the blurred window background.
- static constexpr const MARGINS margins = {-1, -1, -1, -1};
- apis.pDwmExtendFrameIntoClientArea(hwnd, &margins);
+ apis.pDwmExtendFrameIntoClientArea(hwnd, &extendMargins);
if (isWin8OrGreater()) {
ACCENT_POLICY policy{};
policy.dwAccentState = ACCENT_ENABLE_BLURBEHIND;
@@ -913,8 +921,7 @@
} else {
DWM_BLURBEHIND bb{};
bb.fEnable = TRUE;
- bb.fTransitionOnMaximized = TRUE;
- bb.dwFlags = DWM_BB_ENABLE | DWM_BB_TRANSITIONONMAXIMIZED;
+ bb.dwFlags = DWM_BB_ENABLE;
apis.pDwmEnableBlurBehindWindow(hwnd, &bb);
}
} else {
@@ -933,8 +940,7 @@
bb.dwFlags = DWM_BB_ENABLE;
apis.pDwmEnableBlurBehindWindow(hwnd, &bb);
}
- static constexpr const MARGINS margins = {0, 0, 0, 0};
- apis.pDwmExtendFrameIntoClientArea(hwnd, &margins);
+ apis.pDwmExtendFrameIntoClientArea(hwnd, &defaultMargins);
}
return true;
}
@@ -1466,6 +1472,7 @@
int frameSize = getResizeBorderThickness(hWnd);
bool isTop = (nativeLocalPos.y < frameSize);
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
if (isWin10OrGreater()) {
// This will handle the left, right and bottom parts of the frame
// because we didn't change them.
@@ -1508,7 +1515,9 @@
}
*result = HTCLIENT;
return true;
- } else {
+ } else
+#endif
+ {
if (full) {
*result = HTCLIENT;
return true;
@@ -1745,6 +1754,7 @@
// and align it with the upper-left corner of our new client area".
const auto clientRect = wParam ? &(reinterpret_cast<LPNCCALCSIZE_PARAMS>(lParam))->rgrc[0]
: reinterpret_cast<LPRECT>(lParam);
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
if (isWin10OrGreater()) {
// Store the original top margin before the default window procedure applies the
// default frame.
@@ -1772,6 +1782,7 @@
// technique to bring the top border back.
clientRect->top = originalTop;
}
+#endif
const bool max = IsMaximized(hWnd);
const bool full = isFullScreen(hWnd);
// We don't need this correction when we're fullscreen. We will
--
Gitblit v1.9.1