sola/qwindowkit.git

			@@ -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,44 +21,14 @@
			# include <QtGui/qpa/qplatformwindow_p.h>
			#endif

			#include <shellscalingapi.h>
			#include <dwmapi.h>
			#include <timeapi.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
			};

			// The thickness of an auto-hide taskbar in pixels.
			static constexpr const quint8 kAutoHideTaskBarThickness = 2;
			@@ -78,251 +46,6 @@

			// 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(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

			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);

			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);

			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 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;
			#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);
			#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());
			#endif
			}

			static inline void triggerFrameChange(HWND hwnd) {
			::SetWindowPos(hwnd, nullptr, 0, 0, 0, 0,
			@@ -379,16 +102,7 @@
			getSystemMetricsForDpi(SM_CXPADDEDBORDER, dpi);
			}

			static void updateInternalWindowFrameMargins(HWND hwnd, QWindow *window) {
			const auto margins = [hwnd]() -> QMargins {
			const auto titleBarHeight = int(getTitleBarHeight(hwnd));
			if (isWin10OrGreater()) {
			return {0, -titleBarHeight, 0, 0};
			} else {
			const auto frameSize = int(getResizeBorderThickness(hwnd));
			return {-frameSize, -titleBarHeight, -frameSize, -frameSize};
			}
			}();
			static void setInternalWindowFrameMargins(QWindow *window, const QMargins &margins) {
			const QVariant marginsVar = QVariant::fromValue(margins);
			window->setProperty("_q_windowsCustomMargins", marginsVar);
			#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
			@@ -829,7 +543,20 @@
			return ::CallWindowProcW(g_qtWindowProc, hWnd, message, wParam, lParam);
			}

			static inline void addManagedWindow(HWND hWnd, Win32WindowContext *ctx) {
			static inline void addManagedWindow(QWindow window, HWND hWnd, Win32WindowContext ctx) {
			const auto margins = [hWnd]() -> QMargins {
			const auto titleBarHeight = int(getTitleBarHeight(hWnd));
			if (isWin10OrGreater()) {
			return {0, -titleBarHeight, 0, 0};
			} else {
			const auto frameSize = int(getResizeBorderThickness(hWnd));
			return {-frameSize, -titleBarHeight, -frameSize, -frameSize};
			}
			}();

			// Inform Qt we want and have set custom margins
			setInternalWindowFrameMargins(window, margins);

			// Store original window proc
			if (!g_qtWindowProc) {
			g_qtWindowProc = reinterpret_cast<WNDPROC>(::GetWindowLongPtrW(hWnd, GWLP_WNDPROC));
			@@ -845,7 +572,6 @@
			g_wndProcHash->insert(hWnd, ctx);
			}

			template <bool Destroyed = true>
			static inline void removeManagedWindow(HWND hWnd) {
			// Remove window handle mapping
			if (!g_wndProcHash->remove(hWnd))
			@@ -854,11 +580,6 @@
			// Remove event filter if the all windows has been destroyed
			if (g_wndProcHash->empty()) {
			WindowsNativeEventFilter::uninstall();
			}

			// Restore window proc
			if constexpr (!Destroyed) {
			::SetWindowLongPtrW(hWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(g_qtWindowProc));
			}
			}

			@@ -878,18 +599,24 @@
			void Win32WindowContext::virtual_hook(int id, void *data) {
			switch (id) {
			case CentralizeHook: {
			if (!windowId)
			return;
			const auto hwnd = reinterpret_cast<HWND>(windowId);
			moveWindowToDesktopCenter(hwnd);
			return;
			}

			case RaiseWindowHook: {
			if (!windowId)
			return;
			const auto hwnd = reinterpret_cast<HWND>(windowId);
			bringWindowToFront(hwnd);
			return;
			}

			case ShowSystemMenuHook: {
			if (!windowId)
			return;
			const auto &pos = static_cast<const QPoint >(data);
			auto hWnd = reinterpret_cast<HWND>(windowId);
			#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
			@@ -900,23 +627,6 @@
			#endif
			showSystemMenu2(hWnd, qpoint2point(nativeGlobalPos), false,
			m_delegate->isHostSizeFixed(m_host));
			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]);

			if (key == QStringLiteral("no-frame-shadow")) {
			if (newVar.toBool()) {
			// TODO: set off
			} else {
			// TODO: set on
			}
			}

			return;
			}

			@@ -931,6 +641,9 @@
			}

			case DrawWindows10BorderHook: {
			if (!windowId)
			return;

			auto args = static_cast<void **>(data);
			auto &painter = static_cast<QPainter >(args[0]);
			const auto &rect = static_cast<const QRect >(args[1]);
			@@ -984,12 +697,13 @@
			return getWindowFrameBorderThickness(reinterpret_cast<HWND>(windowId));
			}

			void Win32WindowContext::winIdChanged(QWindow *oldWindow, bool isDestroyed) {
			if (isDestroyed) {
			void Win32WindowContext::winIdChanged() {
			// If the original window id is valid, remove all resources related
			if (windowId) {
			removeManagedWindow(reinterpret_cast<HWND>(windowId));
			} else {
			removeManagedWindow<false>(reinterpret_cast<HWND>(windowId));
			windowId = 0;
			}

			if (!m_windowHandle) {
			return;
			}
			@@ -997,6 +711,11 @@
			// Install window hook
			auto winId = m_windowHandle->winId();
			auto hWnd = reinterpret_cast<HWND>(winId);

			if (!isWin10OrGreater()) {
			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 : {
			@@ -1008,11 +727,8 @@
			}
			#endif

			// Inform Qt we want and have set custom margins
			updateInternalWindowFrameMargins(hWnd, m_windowHandle); // TODO: Restore?

			// Add managed window
			addManagedWindow(hWnd, this);
			addManagedWindow(m_windowHandle, hWnd, this);

			// Cache win id
			windowId = winId;