From c9e611aff820922247655b607b60f275b21d385f Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周六, 23 12月 2023 16:58:35 +0800
Subject: [PATCH] Optimize system border condition
---
src/core/contexts/win32windowcontext.cpp | 708 +++++++++++++++++------------------------------------------
1 files changed, 204 insertions(+), 504 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index 3fc2ee3..d78ce81 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -10,8 +10,6 @@
#include <QtGui/QPalette>
#include <QtGui/QStyleHints>
-#include <QtCore/private/qwinregistry_p.h>
-#include <QtCore/private/qsystemlibrary_p.h>
#include <QtGui/private/qhighdpiscaling_p.h>
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
# include <QtGui/private/qguiapplication_p.h>
@@ -23,120 +21,16 @@
# include <QtGui/qpa/qplatformwindow_p.h>
#endif
-#include <shellscalingapi.h>
-#include <dwmapi.h>
-#include <timeapi.h>
+#include <QWKCore/qwkconfig.h>
#include "qwkglobal_p.h"
+#include "qwkwindowsextra_p.h"
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Q_DECLARE_METATYPE(QMargins)
#endif
namespace QWK {
-
- enum _DWMWINDOWATTRIBUTE {
- // [set] BOOL, Allows the use of host backdrop brushes for the window.
- _DWMWA_USE_HOSTBACKDROPBRUSH = 17,
-
- // Undocumented, the same with DWMWA_USE_IMMERSIVE_DARK_MODE, but available on systems
- // before Win10 20H1.
- _DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1 = 19,
-
- // [set] BOOL, Allows a window to either use the accent color, or dark, according to the
- // user Color Mode preferences.
- _DWMWA_USE_IMMERSIVE_DARK_MODE = 20,
-
- // [set] WINDOW_CORNER_PREFERENCE, Controls the policy that rounds top-level window corners
- _DWMWA_WINDOW_CORNER_PREFERENCE = 33,
-
- // [get] UINT, width of the visible border around a thick frame window
- _DWMWA_VISIBLE_FRAME_BORDER_THICKNESS = 37,
-
- // [get, set] SYSTEMBACKDROP_TYPE, Controls the system-drawn backdrop material of a window,
- // including behind the non-client area.
- _DWMWA_SYSTEMBACKDROP_TYPE = 38,
-
- // Undocumented, use this value to enable Mica material on Win11 21H2. You should use
- // DWMWA_SYSTEMBACKDROP_TYPE instead on Win11 22H2 and newer.
- _DWMWA_MICA_EFFECT = 1029
- };
-
- // Types used with DWMWA_SYSTEMBACKDROP_TYPE
- enum _DWM_SYSTEMBACKDROP_TYPE {
- _DWMSBT_AUTO, // [Default] Let DWM automatically decide the system-drawn backdrop for this window.
- _DWMSBT_NONE, // [Disable] Do not draw any system backdrop.
- _DWMSBT_MAINWINDOW, // [Mica] Draw the backdrop material effect corresponding to a long-lived window.
- _DWMSBT_TRANSIENTWINDOW, // [Acrylic] Draw the backdrop material effect corresponding to a transient window.
- _DWMSBT_TABBEDWINDOW, // [Mica Alt] Draw the backdrop material effect corresponding to a window with a tabbed title bar.
- };
-
- enum WINDOWCOMPOSITIONATTRIB {
- WCA_UNDEFINED = 0,
- WCA_NCRENDERING_ENABLED = 1,
- WCA_NCRENDERING_POLICY = 2,
- WCA_TRANSITIONS_FORCEDISABLED = 3,
- WCA_ALLOW_NCPAINT = 4,
- WCA_CAPTION_BUTTON_BOUNDS = 5,
- WCA_NONCLIENT_RTL_LAYOUT = 6,
- WCA_FORCE_ICONIC_REPRESENTATION = 7,
- WCA_EXTENDED_FRAME_BOUNDS = 8,
- WCA_HAS_ICONIC_BITMAP = 9,
- WCA_THEME_ATTRIBUTES = 10,
- WCA_NCRENDERING_EXILED = 11,
- WCA_NCADORNMENTINFO = 12,
- WCA_EXCLUDED_FROM_LIVEPREVIEW = 13,
- WCA_VIDEO_OVERLAY_ACTIVE = 14,
- WCA_FORCE_ACTIVEWINDOW_APPEARANCE = 15,
- WCA_DISALLOW_PEEK = 16,
- WCA_CLOAK = 17,
- WCA_CLOAKED = 18,
- WCA_ACCENT_POLICY = 19,
- WCA_FREEZE_REPRESENTATION = 20,
- WCA_EVER_UNCLOAKED = 21,
- WCA_VISUAL_OWNER = 22,
- WCA_HOLOGRAPHIC = 23,
- WCA_EXCLUDED_FROM_DDA = 24,
- WCA_PASSIVEUPDATEMODE = 25,
- WCA_USEDARKMODECOLORS = 26,
- WCA_CORNER_STYLE = 27,
- WCA_PART_COLOR = 28,
- WCA_DISABLE_MOVESIZE_FEEDBACK = 29,
- WCA_LAST = 30
- };
-
- enum ACCENT_STATE {
- ACCENT_DISABLED = 0,
- ACCENT_ENABLE_GRADIENT = 1,
- ACCENT_ENABLE_TRANSPARENTGRADIENT = 2,
- ACCENT_ENABLE_BLURBEHIND = 3, // Traditional DWM blur
- ACCENT_ENABLE_ACRYLICBLURBEHIND = 4, // RS4 1803
- ACCENT_ENABLE_HOST_BACKDROP = 5, // RS5 1809
- ACCENT_INVALID_STATE = 6 // Using this value will remove the window background
- };
-
- enum ACCENT_FLAG {
- ACCENT_NONE = 0,
- ACCENT_ENABLE_ACRYLIC = 1,
- ACCENT_ENABLE_ACRYLIC_WITH_LUMINOSITY = 482
- };
-
- struct ACCENT_POLICY {
- DWORD dwAccentState;
- DWORD dwAccentFlags;
- DWORD dwGradientColor; // #AABBGGRR
- DWORD dwAnimationId;
- };
- using PACCENT_POLICY = ACCENT_POLICY *;
-
- struct WINDOWCOMPOSITIONATTRIBDATA {
- WINDOWCOMPOSITIONATTRIB Attrib;
- PVOID pvData;
- SIZE_T cbData;
- };
- using PWINDOWCOMPOSITIONATTRIBDATA = WINDOWCOMPOSITIONATTRIBDATA *;
-
- using SetWindowCompositionAttributePtr = BOOL(WINAPI *)(HWND, PWINDOWCOMPOSITIONATTRIBDATA);
// The thickness of an auto-hide taskbar in pixels.
static constexpr const quint8 kAutoHideTaskBarThickness = 2;
@@ -155,259 +49,19 @@
// Original Qt window proc function
static WNDPROC g_qtWindowProc = nullptr;
- struct DynamicApis {
- static const DynamicApis &instance() {
- static const DynamicApis inst{};
- return inst;
- }
-
- // template <typename T>
- // struct DefaultFunc;
- //
- // template <typename Return, typename... Args>
- // struct DefaultFunc<Return(QT_WIN_CALLBACK *)(Args...)> {
- // static Return STDAPICALLTYPE func(Args...) {
- // return Return{};
- // }
- // };
- //
- // #define DYNAMIC_API_DECLARE(NAME) decltype(&::NAME) p##NAME =
- // DefaultFunc<decltype(&::NAME)>::func
-
-#define DYNAMIC_API_DECLARE(NAME) decltype(&::NAME) p##NAME = nullptr
-
- DYNAMIC_API_DECLARE(DwmFlush);
- DYNAMIC_API_DECLARE(DwmIsCompositionEnabled);
- DYNAMIC_API_DECLARE(DwmGetCompositionTimingInfo);
- DYNAMIC_API_DECLARE(DwmGetWindowAttribute);
- DYNAMIC_API_DECLARE(DwmSetWindowAttribute);
- DYNAMIC_API_DECLARE(DwmExtendFrameIntoClientArea);
- DYNAMIC_API_DECLARE(GetDpiForWindow);
- DYNAMIC_API_DECLARE(GetSystemMetricsForDpi);
- DYNAMIC_API_DECLARE(GetDpiForMonitor);
- DYNAMIC_API_DECLARE(timeGetDevCaps);
- DYNAMIC_API_DECLARE(timeBeginPeriod);
- DYNAMIC_API_DECLARE(timeEndPeriod);
-
-#undef DYNAMIC_API_DECLARE
-
- SetWindowCompositionAttributePtr pSetWindowCompositionAttribute = nullptr;
-
- private:
- DynamicApis() {
-#define DYNAMIC_API_RESOLVE(DLL, NAME) \
- p##NAME = reinterpret_cast<decltype(p##NAME)>(DLL.resolve(#NAME))
-
- QSystemLibrary user32(QStringLiteral("user32"));
- DYNAMIC_API_RESOLVE(user32, GetDpiForWindow);
- DYNAMIC_API_RESOLVE(user32, GetSystemMetricsForDpi);
- DYNAMIC_API_RESOLVE(user32, SetWindowCompositionAttribute);
-
- QSystemLibrary shcore(QStringLiteral("shcore"));
- DYNAMIC_API_RESOLVE(shcore, GetDpiForMonitor);
-
- QSystemLibrary dwmapi(QStringLiteral("dwmapi"));
- DYNAMIC_API_RESOLVE(dwmapi, DwmFlush);
- DYNAMIC_API_RESOLVE(dwmapi, DwmIsCompositionEnabled);
- DYNAMIC_API_RESOLVE(dwmapi, DwmGetCompositionTimingInfo);
- DYNAMIC_API_RESOLVE(dwmapi, DwmGetWindowAttribute);
- DYNAMIC_API_RESOLVE(dwmapi, DwmSetWindowAttribute);
- DYNAMIC_API_RESOLVE(dwmapi, DwmExtendFrameIntoClientArea);
-
- QSystemLibrary winmm(QStringLiteral("winmm"));
- DYNAMIC_API_RESOLVE(winmm, timeGetDevCaps);
- DYNAMIC_API_RESOLVE(winmm, timeBeginPeriod);
- DYNAMIC_API_RESOLVE(winmm, timeEndPeriod);
-
-#undef DYNAMIC_API_RESOLVE
- }
-
- ~DynamicApis() = default;
-
- Q_DISABLE_COPY_MOVE(DynamicApis)
- };
-
- static inline constexpr bool operator==(const POINT &lhs, const POINT &rhs) noexcept {
- return ((lhs.x == rhs.x) && (lhs.y == rhs.y));
- }
-
- static inline constexpr bool operator!=(const POINT &lhs, const POINT &rhs) noexcept {
- return !operator==(lhs, rhs);
- }
-
- static inline constexpr bool operator==(const SIZE &lhs, const SIZE &rhs) noexcept {
- return ((lhs.cx == rhs.cx) && (lhs.cy == rhs.cy));
- }
-
- static inline constexpr bool operator!=(const SIZE &lhs, const SIZE &rhs) noexcept {
- return !operator==(lhs, rhs);
- }
-
- static inline constexpr bool operator>(const SIZE &lhs, const SIZE &rhs) noexcept {
- return ((lhs.cx * lhs.cy) > (rhs.cx * rhs.cy));
- }
-
- static inline constexpr bool operator>=(const SIZE &lhs, const SIZE &rhs) noexcept {
- return (operator>(lhs, rhs) || operator==(lhs, rhs));
- }
-
- static inline constexpr bool operator<(const SIZE &lhs, const SIZE &rhs) noexcept {
- return (operator!=(lhs, rhs) && !operator>(lhs, rhs));
- }
-
- static inline constexpr bool operator<=(const SIZE &lhs, const SIZE &rhs) noexcept {
- return (operator<(lhs, rhs) || operator==(lhs, rhs));
- }
-
- static inline constexpr bool operator==(const RECT &lhs, const RECT &rhs) noexcept {
- return ((lhs.left == rhs.left) && (lhs.top == rhs.top) && (lhs.right == rhs.right) &&
- (lhs.bottom == rhs.bottom));
- }
-
- static inline constexpr bool operator!=(const RECT &lhs, const RECT &rhs) noexcept {
- return !operator==(lhs, rhs);
- }
-
- static inline constexpr QPoint point2qpoint(const POINT &point) {
- return QPoint{int(point.x), int(point.y)};
- }
-
- static inline constexpr POINT qpoint2point(const QPoint &point) {
- return POINT{LONG(point.x()), LONG(point.y())};
- }
-
- static inline constexpr QSize size2qsize(const SIZE &size) {
- return QSize{int(size.cx), int(size.cy)};
- }
-
- static inline constexpr SIZE qsize2size(const QSize &size) {
- return SIZE{LONG(size.width()), LONG(size.height())};
- }
-
- static inline constexpr QRect rect2qrect(const RECT &rect) {
- return QRect{
- QPoint{int(rect.left), int(rect.top) },
- QSize{int(RECT_WIDTH(rect)), int(RECT_HEIGHT(rect))}
- };
- }
-
- static inline constexpr RECT qrect2rect(const QRect &qrect) {
- return RECT{LONG(qrect.left()), LONG(qrect.top()), LONG(qrect.right()),
- LONG(qrect.bottom())};
- }
-
- static inline /*constexpr*/ QString hwnd2str(const WId windowId) {
- // NULL handle is allowed here.
- return QLatin1String("0x") +
- QString::number(windowId, 16).toUpper().rightJustified(8, u'0');
- }
-
- static inline /*constexpr*/ QString hwnd2str(HWND hwnd) {
- // NULL handle is allowed here.
- return hwnd2str(reinterpret_cast<WId>(hwnd));
- }
-
- static inline bool isWin8OrGreater() {
- static const bool result = IsWindows8OrGreater_Real();
- return result;
- }
-
- static inline bool isWin8Point1OrGreater() {
- static const bool result = IsWindows8Point1OrGreater_Real();
- return result;
- }
-
- static inline bool isWin10OrGreater() {
- static const bool result = IsWindows10OrGreater_Real();
- return result;
- }
-
- static inline bool isWin11OrGreater() {
- static const bool result = IsWindows11OrGreater_Real();
- return result;
- }
-
- static inline bool isWin1122H2OrGreater() {
- static const bool result = IsWindows1122H2OrGreater_Real();
- return result;
- }
-
- static inline bool isDwmCompositionEnabled() {
- if (isWin8OrGreater()) {
- return true;
- }
- const DynamicApis &apis = DynamicApis::instance();
- if (!apis.pDwmIsCompositionEnabled) {
- return false;
- }
- BOOL enabled = FALSE;
- return SUCCEEDED(apis.pDwmIsCompositionEnabled(&enabled)) && enabled;
- }
-
- static inline bool isWindowFrameBorderColorized() {
- const QWinRegistryKey registry(HKEY_CURRENT_USER, LR"(Software\Microsoft\Windows\DWM)");
- if (!registry.isValid()) {
- return false;
- }
- const auto value = registry.dwordValue(L"ColorPrevalence");
- if (!value.second) {
- return false;
- }
- return value.first;
- }
-
- static inline bool isDarkThemeActive() {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
- return QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark;
-#else
- const QWinRegistryKey registry(
- HKEY_CURRENT_USER, LR"(Software\Microsoft\Windows\CurrentVersion\Themes\Personalize)");
- if (!registry.isValid()) {
- return false;
- }
- const auto value = registry.dwordValue(L"AppsUseLightTheme");
- if (!value.second) {
- return false;
- }
- return !value.first;
+ static inline bool
+#if !QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+ constexpr
#endif
- }
- static inline bool isDarkWindowFrameEnabled(HWND hwnd) {
- BOOL enabled = FALSE;
- const DynamicApis &apis = DynamicApis::instance();
- if (SUCCEEDED(apis.pDwmGetWindowAttribute(hwnd, _DWMWA_USE_IMMERSIVE_DARK_MODE, &enabled,
- sizeof(enabled)))) {
- return enabled;
- } else if (SUCCEEDED(apis.pDwmGetWindowAttribute(hwnd,
- _DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1,
- &enabled, sizeof(enabled)))) {
- return enabled;
- } else {
- return false;
- }
- }
-
- static inline QColor getAccentColor() {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
- return QGuiApplication::palette().color(QPalette::Accent);
+ isSystemBorderEnabled() {
+ return
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+ isWin10OrGreater()
#else
- const QWinRegistryKey registry(HKEY_CURRENT_USER, LR"(Software\Microsoft\Windows\DWM)");
- if (!registry.isValid()) {
- return {};
- }
- const auto value = registry.dwordValue(L"AccentColor");
- if (!value.second) {
- return {};
- }
- // The retrieved value is in the #AABBGGRR format, we need to
- // convert it to the #AARRGGBB format which Qt expects.
- const QColor abgr = QColor::fromRgba(value.first);
- if (!abgr.isValid()) {
- return {};
- }
- return QColor::fromRgb(abgr.blue(), abgr.green(), abgr.red(), abgr.alpha());
+ false
#endif
+ ;
}
static inline void triggerFrameChange(HWND hwnd) {
@@ -909,7 +563,7 @@
static inline void addManagedWindow(QWindow *window, HWND hWnd, Win32WindowContext *ctx) {
const auto margins = [hWnd]() -> QMargins {
const auto titleBarHeight = int(getTitleBarHeight(hWnd));
- if (isWin10OrGreater()) {
+ if (isSystemBorderEnabled()) {
return {0, -titleBarHeight, 0, 0};
} else {
const auto frameSize = int(getResizeBorderThickness(hWnd));
@@ -993,131 +647,6 @@
return;
}
- case WindowAttributeChangedHook: {
- auto args = static_cast<void **>(data);
- const auto &key = *static_cast<const QString *>(args[0]);
- const auto &newVar = *static_cast<const QVariant *>(args[1]);
- const auto &oldVar = *static_cast<const QVariant *>(args[2]);
- auto &res = *static_cast<bool *>(args[3]);
-
- if (!windowId)
- return;
- const auto hwnd = reinterpret_cast<HWND>(windowId);
-
- const DynamicApis &apis = DynamicApis::instance();
-
- if (key == QStringLiteral("frame-shadow")) {
- if (newVar.toBool()) {
- // TODO: set off
- } else {
- // TODO: set on
- }
- } else if (key == QStringLiteral("mica")) {
- if (!isWin11OrGreater()) {
- return;
- }
- if (newVar.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);
- if (isWin1122H2OrGreater()) {
- // Use official DWM API to enable Mica, available since Windows 11 22H2
- // (10.0.22621).
- const _DWM_SYSTEMBACKDROP_TYPE backdropType = _DWMSBT_MAINWINDOW;
- apis.pDwmSetWindowAttribute(hwnd, _DWMWA_SYSTEMBACKDROP_TYPE,
- &backdropType, sizeof(backdropType));
- } else {
- // Use undocumented DWM API to enable Mica, available since Windows 11
- // (10.0.22000).
- const BOOL enable = TRUE;
- apis.pDwmSetWindowAttribute(hwnd, _DWMWA_MICA_EFFECT, &enable,
- sizeof(enable));
- }
- } else {
- if (isWin1122H2OrGreater()) {
- const _DWM_SYSTEMBACKDROP_TYPE backdropType = _DWMSBT_AUTO;
- apis.pDwmSetWindowAttribute(hwnd, _DWMWA_SYSTEMBACKDROP_TYPE,
- &backdropType, sizeof(backdropType));
- } else {
- 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);
- }
- } else if (key == QStringLiteral("mica-alt")) {
- if (!isWin1122H2OrGreater()) {
- return;
- }
- if (newVar.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);
- // Use official DWM API to enable Mica Alt, available since Windows 11 22H2
- // (10.0.22621).
- const _DWM_SYSTEMBACKDROP_TYPE backdropType = _DWMSBT_TABBEDWINDOW;
- apis.pDwmSetWindowAttribute(hwnd, _DWMWA_SYSTEMBACKDROP_TYPE, &backdropType,
- sizeof(backdropType));
- } else {
- 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);
- }
- res = true;
- } else if (key == QStringLiteral("acrylic-material")) {
- if (newVar.type() == QVariant::Color) {
- // 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);
- if (isWin11OrGreater()) {
- const _DWM_SYSTEMBACKDROP_TYPE backdropType = _DWMSBT_TRANSIENTWINDOW;
- apis.pDwmSetWindowAttribute(hwnd, _DWMWA_SYSTEMBACKDROP_TYPE,
- &backdropType, sizeof(backdropType));
- } else {
- auto gradientColor = newVar.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);
- }
- } 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);
- }
- static constexpr const MARGINS margins = {0, 0, 0, 0};
- apis.pDwmExtendFrameIntoClientArea(hwnd, &margins);
- }
- res = true;
- }
- return;
- }
-
case DefaultColorsHook: {
auto &map = *static_cast<QMap<QString, QColor> *>(data);
map.clear();
@@ -1178,7 +707,8 @@
}
bool Win32WindowContext::needBorderPainter() const {
- return isWin10OrGreater() && !isWin11OrGreater();
+ Q_UNUSED(this)
+ return isSystemBorderEnabled() && !isWin11OrGreater();
}
int Win32WindowContext::borderThickness() const {
@@ -1200,20 +730,20 @@
auto winId = m_windowHandle->winId();
auto hWnd = reinterpret_cast<HWND>(winId);
- if (!isWin10OrGreater()) {
+ if (!isSystemBorderEnabled()) {
static constexpr const MARGINS margins = {1, 1, 1, 1};
DynamicApis::instance().pDwmExtendFrameIntoClientArea(hWnd, &margins);
}
-#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));
- }
+ {
+ 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);
@@ -1273,6 +803,178 @@
}
}
return false; // Not handled
+ }
+
+ bool Win32WindowContext::windowAttributeChanged(const QString &key, const QVariant &attribute,
+ const QVariant &oldAttribute) {
+ 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 =
+ isSystemBorderEnabled() ? MARGINS{0, 0, 0, 0} : MARGINS{1, 1, 1, 1};
+ if (key == QStringLiteral("mica")) {
+ if (!isWin11OrGreater()) {
+ return false;
+ }
+ 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 (isWin1122H2OrGreater()) {
+ // Use official DWM API to enable Mica, available since Windows 11 22H2
+ // (10.0.22621).
+ const _DWM_SYSTEMBACKDROP_TYPE backdropType = _DWMSBT_MAINWINDOW;
+ apis.pDwmSetWindowAttribute(hwnd, _DWMWA_SYSTEMBACKDROP_TYPE, &backdropType,
+ sizeof(backdropType));
+ } else {
+ // Use undocumented DWM API to enable Mica, available since Windows 11
+ // (10.0.22000).
+ const BOOL enable = TRUE;
+ apis.pDwmSetWindowAttribute(hwnd, _DWMWA_MICA_EFFECT, &enable, sizeof(enable));
+ }
+ } else {
+ if (isWin1122H2OrGreater()) {
+ const _DWM_SYSTEMBACKDROP_TYPE backdropType = _DWMSBT_AUTO;
+ apis.pDwmSetWindowAttribute(hwnd, _DWMWA_SYSTEMBACKDROP_TYPE, &backdropType,
+ sizeof(backdropType));
+ } else {
+ const BOOL enable = FALSE;
+ apis.pDwmSetWindowAttribute(hwnd, _DWMWA_MICA_EFFECT, &enable, sizeof(enable));
+ }
+ apis.pDwmExtendFrameIntoClientArea(hwnd, &defaultMargins);
+ }
+ return true;
+ } else if (key == QStringLiteral("mica-alt")) {
+ if (!isWin1122H2OrGreater()) {
+ return false;
+ }
+ 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);
+ // Use official DWM API to enable Mica Alt, available since Windows 11 22H2
+ // (10.0.22621).
+ const _DWM_SYSTEMBACKDROP_TYPE backdropType = _DWMSBT_TABBEDWINDOW;
+ apis.pDwmSetWindowAttribute(hwnd, _DWMWA_SYSTEMBACKDROP_TYPE, &backdropType,
+ sizeof(backdropType));
+ } else {
+ const _DWM_SYSTEMBACKDROP_TYPE backdropType = _DWMSBT_AUTO;
+ apis.pDwmSetWindowAttribute(hwnd, _DWMWA_SYSTEMBACKDROP_TYPE, &backdropType,
+ sizeof(backdropType));
+ apis.pDwmExtendFrameIntoClientArea(hwnd, &defaultMargins);
+ }
+ return true;
+ } else if (key == QStringLiteral("acrylic-material")) {
+ if (!isWin11OrGreater()) {
+ return false;
+ }
+ 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);
+
+ 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 {
+ 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.
+ apis.pDwmExtendFrameIntoClientArea(hwnd, &extendMargins);
+ if (isWin8OrGreater()) {
+ ACCENT_POLICY policy{};
+ policy.dwAccentState = ACCENT_ENABLE_BLURBEHIND;
+ policy.dwAccentFlags = ACCENT_NONE;
+ WINDOWCOMPOSITIONATTRIBDATA wcad{};
+ wcad.Attrib = WCA_ACCENT_POLICY;
+ wcad.pvData = &policy;
+ wcad.cbData = sizeof(policy);
+ apis.pSetWindowCompositionAttribute(hwnd, &wcad);
+ } else {
+ DWM_BLURBEHIND bb{};
+ bb.fEnable = TRUE;
+ bb.dwFlags = DWM_BB_ENABLE;
+ apis.pDwmEnableBlurBehindWindow(hwnd, &bb);
+ }
+ } else {
+ if (isWin8OrGreater()) {
+ 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);
+ } else {
+ DWM_BLURBEHIND bb{};
+ bb.fEnable = FALSE;
+ bb.dwFlags = DWM_BB_ENABLE;
+ apis.pDwmEnableBlurBehindWindow(hwnd, &bb);
+ }
+ apis.pDwmExtendFrameIntoClientArea(hwnd, &defaultMargins);
+ }
+ return true;
+ } else if (key == QStringLiteral("dark-mode")) {
+ if (!isWin101809OrGreater()) {
+ return false;
+ }
+
+ BOOL enable = attribute.toBool();
+
+ if (isWin101903OrGreater()) {
+ apis.pSetPreferredAppMode(enable ? PAM_AUTO : PAM_DEFAULT);
+ } else {
+ apis.pAllowDarkModeForApp(enable);
+ }
+
+ for (const auto attr : {
+ _DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1,
+ _DWMWA_USE_IMMERSIVE_DARK_MODE,
+ }) {
+ apis.pDwmSetWindowAttribute(hwnd, attr, &enable, sizeof(enable));
+ }
+
+ apis.pFlushMenuThemes();
+
+ return true;
+ }
+ return false;
}
QWK_USED static constexpr const struct {
@@ -1800,7 +1502,7 @@
int frameSize = getResizeBorderThickness(hWnd);
bool isTop = (nativeLocalPos.y < frameSize);
- if (isWin10OrGreater()) {
+ if (isSystemBorderEnabled()) {
// This will handle the left, right and bottom parts of the frame
// because we didn't change them.
LRESULT originalHitTestResult = ::DefWindowProcW(hWnd, WM_NCHITTEST, 0, lParam);
@@ -1928,7 +1630,7 @@
break;
}
- if (!isWin10OrGreater()) {
+ if (!isSystemBorderEnabled()) {
switch (message) {
case WM_NCUAHDRAWCAPTION:
case WM_NCUAHDRAWFRAME: {
@@ -1960,11 +1662,7 @@
// window activation state change.
*result = ::DefWindowProcW(hWnd, WM_NCACTIVATE, wParam, -1);
} else {
- if (wParam) {
- *result = FALSE;
- } else {
- *result = TRUE;
- }
+ *result = TRUE;
}
return true;
}
@@ -2083,7 +1781,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 (isWin10OrGreater()) {
+ if (isSystemBorderEnabled()) {
// Store the original top margin before the default window procedure applies the
// default frame.
const LONG originalTop = clientRect->top;
@@ -2110,6 +1808,7 @@
// technique to bring the top border back.
clientRect->top = originalTop;
}
+
const bool max = IsMaximized(hWnd);
const bool full = isFullScreen(hWnd);
// We don't need this correction when we're fullscreen. We will
@@ -2124,7 +1823,7 @@
// a window when it's maximized unless you restore it).
const quint32 frameSize = getResizeBorderThickness(hWnd);
clientRect->top += frameSize;
- if (!isWin10OrGreater()) {
+ if (!isSystemBorderEnabled()) {
clientRect->bottom -= frameSize;
clientRect->left += frameSize;
clientRect->right -= frameSize;
@@ -2227,10 +1926,11 @@
const auto getNativeGlobalPosFromKeyboard = [hWnd]() -> POINT {
const bool maxOrFull = IsMaximized(hWnd) || isFullScreen(hWnd);
const quint32 frameSize = getResizeBorderThickness(hWnd);
- const quint32 horizontalOffset = ((maxOrFull || !isWin10OrGreater()) ? 0 : frameSize);
+ const quint32 horizontalOffset =
+ ((maxOrFull || !isSystemBorderEnabled()) ? 0 : frameSize);
const auto verticalOffset = [hWnd, maxOrFull, frameSize]() -> quint32 {
const quint32 titleBarHeight = getTitleBarHeight(hWnd);
- if (!isWin10OrGreater()) {
+ if (!isSystemBorderEnabled()) {
return titleBarHeight;
}
if (isWin11OrGreater()) {
--
Gitblit v1.9.1