From 087591ff0090d0417dfda10968a0411caab4a7c0 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周六, 23 12月 2023 16:43:42 +0800
Subject: [PATCH] Update document
---
src/core/contexts/win32windowcontext.cpp | 105 ++++++++++++++++++++++++++++++----------------------
1 files changed, 60 insertions(+), 45 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index 19f1864..146ce65 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -715,19 +715,28 @@
auto hWnd = reinterpret_cast<HWND>(winId);
#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
- if (!isWin10OrGreater())
-#endif
- {
+ if (!isWin10OrGreater()) {
static constexpr const MARGINS margins = {1, 1, 1, 1};
DynamicApis::instance().pDwmExtendFrameIntoClientArea(hWnd, &margins);
}
-
-#if !QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+#else
{
- auto style = ::GetWindowLongPtrW(hWnd, GWL_STYLE);
- ::SetWindowLongPtrW(hWnd, GWL_STYLE, (style | WS_THICKFRAME) & (~WS_CAPTION));
+ static const MARGINS margins =
+ isWin10OrGreater() ? MARGINS{0, 0, 0, 0} : MARGINS{1, 1, 1, 1};
+ DynamicApis::instance().pDwmExtendFrameIntoClientArea(hWnd, &margins);
}
#endif
+
+
+ {
+ 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
+ }
// Add managed window
addManagedWindow(m_windowHandle, hWnd, this);
@@ -849,52 +858,53 @@
}
return true;
} else if (key == QStringLiteral("acrylic-material")) {
- if (!isWin10OrGreater()) {
+ if (!isWin11OrGreater()) {
return false;
}
- if (attribute.userType() == QMetaType::QColor) {
+ 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, &extendMargins);
- if (isWin11OrGreater()) {
- const _DWM_SYSTEMBACKDROP_TYPE backdropType = _DWMSBT_TRANSIENTWINDOW;
- apis.pDwmSetWindowAttribute(hwnd, _DWMWA_SYSTEMBACKDROP_TYPE, &backdropType,
- sizeof(backdropType));
- } else {
- auto gradientColor = attribute.value<QColor>();
- ACCENT_POLICY policy{};
- policy.dwAccentState = ACCENT_ENABLE_ACRYLICBLURBEHIND;
- policy.dwAccentFlags = ACCENT_ENABLE_ACRYLIC_WITH_LUMINOSITY;
- // This API expects the #AABBGGRR format.
- policy.dwGradientColor =
- DWORD(qRgba(gradientColor.blue(), gradientColor.green(),
- gradientColor.red(), gradientColor.alpha()));
- WINDOWCOMPOSITIONATTRIBDATA wcad{};
- wcad.Attrib = WCA_ACCENT_POLICY;
- wcad.pvData = &policy;
- wcad.cbData = sizeof(policy);
- apis.pSetWindowCompositionAttribute(hwnd, &wcad);
- }
+ const _DWM_SYSTEMBACKDROP_TYPE backdropType = _DWMSBT_TRANSIENTWINDOW;
+ apis.pDwmSetWindowAttribute(hwnd, _DWMWA_SYSTEMBACKDROP_TYPE, &backdropType,
+ sizeof(backdropType));
+
+ // PRIVATE API REFERENCE:
+ // QColor gradientColor = {};
+ // ACCENT_POLICY policy{};
+ // policy.dwAccentState = ACCENT_ENABLE_ACRYLICBLURBEHIND;
+ // policy.dwAccentFlags = ACCENT_ENABLE_ACRYLIC_WITH_LUMINOSITY;
+ // // This API expects the #AABBGGRR format.
+ // policy.dwGradientColor =
+ // DWORD(qRgba(gradientColor.blue(), gradientColor.green(),
+ // gradientColor.red(), gradientColor.alpha()));
+ // WINDOWCOMPOSITIONATTRIBDATA wcad{};
+ // wcad.Attrib = WCA_ACCENT_POLICY;
+ // wcad.pvData = &policy;
+ // wcad.cbData = sizeof(policy);
+ // apis.pSetWindowCompositionAttribute(hwnd, &wcad);
} else {
- if (isWin11OrGreater()) {
- const _DWM_SYSTEMBACKDROP_TYPE backdropType = _DWMSBT_AUTO;
- apis.pDwmSetWindowAttribute(hwnd, _DWMWA_SYSTEMBACKDROP_TYPE, &backdropType,
- sizeof(backdropType));
- } else {
- ACCENT_POLICY policy{};
- policy.dwAccentState = ACCENT_DISABLED;
- policy.dwAccentFlags = ACCENT_NONE;
- WINDOWCOMPOSITIONATTRIBDATA wcad{};
- wcad.Attrib = WCA_ACCENT_POLICY;
- wcad.pvData = &policy;
- wcad.cbData = sizeof(policy);
- apis.pSetWindowCompositionAttribute(hwnd, &wcad);
- }
+ const _DWM_SYSTEMBACKDROP_TYPE backdropType = _DWMSBT_AUTO;
+ apis.pDwmSetWindowAttribute(hwnd, _DWMWA_SYSTEMBACKDROP_TYPE, &backdropType,
+ sizeof(backdropType));
+
+ // PRIVATE API REFERENCE:
+ // ACCENT_POLICY policy{};
+ // policy.dwAccentState = ACCENT_DISABLED;
+ // policy.dwAccentFlags = ACCENT_NONE;
+ // WINDOWCOMPOSITIONATTRIBDATA wcad{};
+ // wcad.Attrib = WCA_ACCENT_POLICY;
+ // wcad.pvData = &policy;
+ // wcad.cbData = sizeof(policy);
+ // apis.pSetWindowCompositionAttribute(hwnd, &wcad);
+
apis.pDwmExtendFrameIntoClientArea(hwnd, &defaultMargins);
}
return true;
} else 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.
@@ -947,9 +957,9 @@
}
for (const auto attr : {
- _DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1,
- _DWMWA_USE_IMMERSIVE_DARK_MODE,
- }) {
+ _DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1,
+ _DWMWA_USE_IMMERSIVE_DARK_MODE,
+ }) {
apis.pDwmSetWindowAttribute(hwnd, attr, &enable, sizeof(enable));
}
@@ -1810,11 +1820,16 @@
// a window when it's maximized unless you restore it).
const quint32 frameSize = getResizeBorderThickness(hWnd);
clientRect->top += frameSize;
+
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
if (!isWin10OrGreater()) {
+#endif
clientRect->bottom -= frameSize;
clientRect->left += frameSize;
clientRect->right -= frameSize;
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
}
+#endif
}
// Attempt to detect if there's an autohide taskbar, and if
// there is, reduce our size a bit on the side with the taskbar,
--
Gitblit v1.9.1