sola/qwindowkit.git

			@@ -33,6 +33,10 @@
			#include "qwkglobal_p.h"
			#include "qwkwindowsextra_p.h"

			#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) && (QT_VERSION <= QT_VERSION_CHECK(6, 6, 1))
			# error Current Qt version has a critical bug which will break QWK functionality. Please upgrade to > 6.6.1 or downgrade to < 6.6.0
			#endif

			namespace QWK {

			enum IconButtonClickLevelFlag {
			@@ -204,51 +208,6 @@
			moveWindowToMonitor(hwnd, activeMonitor);
			}

			static void syncPaintEventWithDwm() {
			// No need to sync with DWM if DWM composition is disabled.
			if (!isDwmCompositionEnabled()) {
			return;
			}
			const DynamicApis &apis = DynamicApis::instance();
			// Dirty hack to workaround the resize flicker caused by DWM.
			LARGE_INTEGER freq{};
			::QueryPerformanceFrequency(&freq);
			TIMECAPS tc{};
			apis.ptimeGetDevCaps(&tc, sizeof(tc));
			const UINT ms_granularity = tc.wPeriodMin;
			apis.ptimeBeginPeriod(ms_granularity);
			LARGE_INTEGER now0{};
			::QueryPerformanceCounter(&now0);
			// ask DWM where the vertical blank falls
			DWM_TIMING_INFO dti{};
			dti.cbSize = sizeof(dti);
			apis.pDwmGetCompositionTimingInfo(nullptr, &dti);
			LARGE_INTEGER now1{};
			::QueryPerformanceCounter(&now1);
			// - DWM told us about SOME vertical blank
			// - past or future, possibly many frames away
			// - convert that into the NEXT vertical blank
			const auto period = qreal(dti.qpcRefreshPeriod);
			const auto dt = qreal(dti.qpcVBlank - now1.QuadPart);
			const qreal ratio = (dt / period);
			auto w = qreal(0);
			auto m = qreal(0);
			if ((dt > qreal(0)) \|\| qFuzzyIsNull(dt)) {
			w = ratio;
			} else {
			// reach back to previous period
			// - so m represents consistent position within phase
			w = (ratio - qreal(1));
			}
			m = (dt - (period * w));
			if ((m < qreal(0)) \|\| qFuzzyCompare(m, period) \|\| (m > period)) {
			return;
			}
			const qreal m_ms = (qreal(1000) * m / qreal(freq.QuadPart));
			::Sleep(static_cast<DWORD>(std::round(m_ms)));
			apis.ptimeEndPeriod(ms_granularity);
			}

			// Returns false if the menu is canceled
			static bool showSystemMenu_sys(HWND hWnd, const POINT &pos, const bool selectFirstEntry,
			const bool fixedSize) {
			@@ -343,7 +302,6 @@
			case HTBORDER:
			return Win32WindowContext::FixedBorder;
			default:
			Q_UNREACHABLE();
			break;
			}
			return Win32WindowContext::Outside;
			@@ -828,6 +786,10 @@
			return isSystemBorderEnabled() && !isWin11OrGreater();
			}

			if (key == QStringLiteral("windows-system-border-enabled")) {
			return isSystemBorderEnabled();
			}

			if (key == QStringLiteral("border-thickness")) {
			return m_windowId
			? int(getWindowFrameBorderThickness(reinterpret_cast<HWND>(m_windowId)))
			@@ -835,9 +797,7 @@
			}

			if (key == QStringLiteral("title-bar-height")) {
			return m_windowId
			? int(getTitleBarHeight(reinterpret_cast<HWND>(m_windowId)))
			: 0;
			return m_windowId ? int(getTitleBarHeight(reinterpret_cast<HWND>(m_windowId))) : 0;
			}
			return AbstractWindowContext::windowAttribute(key);
			}
			@@ -848,16 +808,10 @@
			lastHitTestResult = WindowPart::Outside;
			lastHitTestResultRaw = HTNOWHERE;

			if (!isSystemBorderEnabled()) {
			m_delegate->setWindowFlags(m_host, m_delegate->getWindowFlags(m_host) \|
			Qt::FramelessWindowHint);
			}

			// If the original window id is valid, remove all resources related
			if (oldWinId) {
			removeManagedWindow(reinterpret_cast<HWND>(oldWinId));
			}

			if (!winId) {
			return;
			}
			@@ -943,8 +897,40 @@
			Q_UNUSED(oldAttribute)

			const auto hwnd = reinterpret_cast<HWND>(m_windowId);
			Q_ASSERT(hwnd);
			if (!hwnd) {
			return false;
			}

			const DynamicApis &apis = DynamicApis::instance();
			static constexpr const MARGINS extendedMargins = {-1, -1, -1, -1};
			const auto &extendMargins = [this, &apis, hwnd]() {
			// For some unknown reason, the window background is totally black when the host object
			// is a QWidget. And extending the window frame into the client area seems to fix it
			// magically.
			// We don't need the following HACK for QtQuick windows.
			if (!m_host->isWidgetType()) {
			return;
			}
			// After many times of trying, we found that the Acrylic/Mica/Mica Alt background
			// only appears on the native Win32 window's background, so naturally we want to
			// extend the window frame into the whole client area to be able to let the special
			// material fill the whole window. Previously we are using negative margins because
			// it's widely known that using negative margins will let the window frame fill
			// the whole window and that's indeed what we wanted to do, however, later we found
			// that doing so is causing issues. When the user enabled the "show accent color on
			// window title bar and borders" option on system personalize settings, a 30px bar
			// would appear on window top. It has the same color with the system accent color.
			// Actually it's the original title bar we've already hidden, and it magically
			// appears again when we use negative margins to extend the window frame. And again
			// after some experiments, I found that the title bar won't appear if we don't extend
			// from the top side. In the end I found that we only need to extend from the left
			// side if we extend long enough. In this way we can see the special material even
			// when the host object is a QWidget and the title bar still remain hidden. But even
			// though this solution seems perfect, I really don't know why it works. The following
			// hack is totally based on experiments.
			static constexpr const MARGINS margins = {65536, 0, 0, 0};
			apis.pDwmExtendFrameIntoClientArea(hwnd, &margins);
			};
			const auto &restoreMargins = [this, &apis, hwnd]() {
			auto margins = qmargins2margins(
			m_windowAttributes.value(QStringLiteral("extra-margins")).value<QMargins>());
			@@ -953,7 +939,7 @@

			if (key == QStringLiteral("extra-margins")) {
			auto margins = qmargins2margins(attribute.value<QMargins>());
			return apis.pDwmExtendFrameIntoClientArea(hwnd, &margins) == S_OK;
			return SUCCEEDED(apis.pDwmExtendFrameIntoClientArea(hwnd, &margins));
			}

			if (key == QStringLiteral("dark-mode")) {
			@@ -967,12 +953,8 @@
			} 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));
			}
			const auto attr = isWin1020H1OrGreater() ? _DWMWA_USE_IMMERSIVE_DARK_MODE : _DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1;
			apis.pDwmSetWindowAttribute(hwnd, attr, &enable, sizeof(enable));

			apis.pFlushMenuThemes();
			return true;
			@@ -984,9 +966,7 @@
			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, &extendedMargins);
			extendMargins();
			if (isWin1122H2OrGreater()) {
			// Use official DWM API to enable Mica, available since Windows 11 22H2
			// (10.0.22621).
			@@ -1018,9 +998,7 @@
			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, &extendedMargins);
			extendMargins();
			// Use official DWM API to enable Mica Alt, available since Windows 11 22H2
			// (10.0.22621).
			const _DWM_SYSTEMBACKDROP_TYPE backdropType = _DWMSBT_TABBEDWINDOW;
			@@ -1040,9 +1018,7 @@
			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, &extendedMargins);
			extendMargins();

			const _DWM_SYSTEMBACKDROP_TYPE backdropType = _DWMSBT_TRANSIENTWINDOW;
			apis.pDwmSetWindowAttribute(hwnd, _DWMWA_SYSTEMBACKDROP_TYPE, &backdropType,
			@@ -1083,9 +1059,9 @@
			}

			if (key == QStringLiteral("dwm-blur")) {
			// Extending window frame would break this effect for some unknown reason.
			restoreMargins();
			if (attribute.toBool()) {
			// We can't extend the window frame for this effect.
			restoreMargins();
			if (isWin8OrGreater()) {
			ACCENT_POLICY policy{};
			policy.dwAccentState = ACCENT_ENABLE_BLURBEHIND;
			@@ -1696,7 +1672,8 @@
			// outside the window, that is, the three transparent window resize area.
			// Returning HTCLIENT will confuse Windows, we can't put our controls there
			// anyway.
			*result = HTNOWHERE; // Make sure we can know we don't set any value explicitly later.
			*result = HTNOWHERE; // Make sure we can know we don't set any value
			// explicitly later.
			if (originalHitTestResult == HTCAPTION) {
			} else if (isFixedSize \|\| dontOverrideCursor) {
			*result = HTBORDER;
			@@ -1725,11 +1702,13 @@
			} else {
			*result = HTLEFT;
			}
			} else if (originalHitTestResult == HTLEFT \|\| originalHitTestResult == HTRIGHT) {
			} else if (originalHitTestResult == HTLEFT \|\|
			originalHitTestResult == HTRIGHT) {
			if (isFixedWidth) {
			*result = HTBORDER;
			}
			} else if (originalHitTestResult == HTTOP \|\| originalHitTestResult == HTBOTTOM) {
			} else if (originalHitTestResult == HTTOP \|\|
			originalHitTestResult == HTBOTTOM) {
			if (isFixedHeight) {
			*result = HTBORDER;
			}
			@@ -1758,7 +1737,8 @@
			// inside our homemade title bar now, return HTCLIENT to let our
			// title bar can still capture mouse events.
			*result = [&]() {
			if (isFixedSize \|\| isFixedHeight \|\| dontOverrideCursor \|\| (isFixedWidth && (isInLeftBorder \|\| isInRightBorder))) {
			if (isFixedSize \|\| isFixedHeight \|\| dontOverrideCursor \|\|
			(isFixedWidth && (isInLeftBorder \|\| isInRightBorder))) {
			if (isInTitleBar) {
			return HTCAPTION;
			} else {
			@@ -2041,6 +2021,17 @@
			// 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);
			[[maybe_unused]] const auto& d3dFlickerReducer = qScopeGuard([this]() {
			// When we receive this message, it means the window size has changed
			// already, and it seems this message always come before any client
			// area size notifications (eg. WM_WINDOWPOSCHANGED and WM_SIZE). Let
			// D3D paint immediately to let user see the latest result as soon as
			// possible.
			if (m_windowHandle && m_windowHandle->surfaceType() == QSurface::Direct3DSurface
			&& isDwmCompositionEnabled() && DynamicApis::instance().pDwmFlush) {
			DynamicApis::instance().pDwmFlush();
			}
			});
			if (isSystemBorderEnabled()) {
			// Store the original top margin before the default window procedure applies the
			// default frame.
			@@ -2162,8 +2153,6 @@
			}
			}
			}
			// We should call this function only before the function returns.
			syncPaintEventWithDwm();
			// By returning WVR_REDRAW we can make the window resizing look
			// less broken. But we must return 0 if wParam is FALSE, according to Microsoft
			// Docs.
			@@ -2174,7 +2163,10 @@
			// of the upper-left non-client area. It's confirmed that this issue exists
			// from Windows 7 to Windows 10. Not tested on Windows 11 yet. Don't know
			// whether it exists on Windows XP to Windows Vista or not.
			*result = wParam ? WVR_REDRAW : FALSE;

			// https://github.com/chromium/chromium/blob/5d297da3cf2a642e9ace2b23fed097370bc70814/ui/views/win/hwnd_message_handler.cc#L2330
			// Do not return WVR_REDRAW otherwise child HWNDs will be mispositioned.
			*result = FALSE;
			return true;
			}