sola/qwindowkit.git

			@@ -12,15 +12,21 @@

			namespace QWK {

			#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
			static inline bool isWindows1022H2OrGreater() {
			RTL_OSVERSIONINFOW rovi = Private::GetRealOSVersion();
			return (rovi.dwMajorVersion > 10) \|\|
			(rovi.dwMajorVersion == 10 &&
			(rovi.dwMinorVersion > 0 \|\| rovi.dwBuildNumber >= 19045));
			}

			class DeferredDeleteHook;
			#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)

			class BorderItem : public QQuickPaintedItem, public Windows10BorderHandler {
			public:
			explicit BorderItem(QQuickItem parent, AbstractWindowContext context);
			~BorderItem() override;

			bool shouldEnableEmulatedPainter() const;
			void updateGeometry() override;

			public:
			@@ -29,30 +35,41 @@

			protected:
			bool sharedEventFilter(QObject obj, QEvent event) override;
			bool nativeEventFilter(const QByteArray &eventType, void *message,
			QT_NATIVE_EVENT_RESULT_TYPE *result) override;

			std::unique_ptr<DeferredDeleteHook> paintHook;
			private:
			volatile bool needPaint = false;

			void _q_afterSynchronizing();
			void _q_windowActivityChanged();
			};

			class DeferredDeleteHook : public QObject {
			public:
			DeferredDeleteHook(BorderItem *item) : item(item) {
			bool BorderItem::shouldEnableEmulatedPainter() const {
			# if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
			const QQuickWindow* win = window();
			if (!win) {
			return true;
			}

			// Override deferred delete handler
			bool event(QEvent *event) override {
			if (event->type() == QEvent::DeferredDelete) {
			item->drawBorder();
			return true;
			}
			return QObject::event(event);
			auto api = win->rendererInterface()->graphicsApi();
			switch (api) {
			case QSGRendererInterface::OpenGL:
			// FIXME: experimental, try to find the exact fixed version.
			return !isWindows1022H2OrGreater();
			case QSGRendererInterface::Direct3D11:
			# if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
			case QSGRendererInterface::Direct3D12:
			# endif
			return false;
			default:
			break;
			}

			BorderItem *item;
			};
			# endif
			return true;
			}

			BorderItem::BorderItem(QQuickItem parent, AbstractWindowContext context)
			: QQuickPaintedItem(parent), Windows10BorderHandler(context),
			paintHook(std::make_unique<DeferredDeleteHook>(this)) {
			: QQuickPaintedItem(parent), Windows10BorderHandler(context) {
			setAntialiasing(true); // We need anti-aliasing to give us better result.
			setFillColor({}); // Will improve the performance a little bit.
			setOpaquePainting(true); // Will also improve the performance, we don't draw
			@@ -67,6 +84,13 @@
			setZ(std::numeric_limits<qreal>::max()); // Make sure our fake border always above
			// everything in the window.

			# if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
			connect(window(), &QQuickWindow::afterSynchronizing, this,
			&BorderItem::_q_afterSynchronizing, Qt::DirectConnection);
			# endif
			connect(window(), &QQuickWindow::activeChanged, this,
			&BorderItem::_q_windowActivityChanged);

			// First update
			if (context->windowId()) {
			setupNecessaryAttributes();
			@@ -77,19 +101,21 @@
			BorderItem::~BorderItem() = default;

			void BorderItem::updateGeometry() {
			setHeight(borderThickness());
			const QQuickWindow* win = window();
			if (!win) {
			return;
			}
			setHeight(borderThickness() / win->effectiveDevicePixelRatio());
			setVisible(isNormalWindow());
			}

			void BorderItem::paint(QPainter *painter) {
			Q_UNUSED(painter)

			// https://github.com/qt/qtdeclarative/blob/cc04afbb382fd4b1f65173d71f44d3372c47b0e1/src/quick/scenegraph/qsgthreadedrenderloop.cpp#L551
			// https://github.com/qt/qtdeclarative/blob/cc04afbb382fd4b1f65173d71f44d3372c47b0e1/src/quick/scenegraph/qsgthreadedrenderloop.cpp#L561
			// QCoreApplication must process all DeferredDelay events right away after rendering, we can
			// hook it by overriding a specifiy QObject's event handler and draw the native border in
			// it.
			paintHook->deleteLater();
			if (shouldEnableEmulatedPainter()) {
			drawBorderEmulated(painter, QRect({0, 0}, size().toSize()));
			} else {
			needPaint = true;
			}
			}

			void BorderItem::itemChange(ItemChange change, const ItemChangeData &data) {
			@@ -111,7 +137,6 @@
			switch (event->type()) {
			case QEvent::WindowStateChange: {
			updateGeometry();
			break;
			}
			default:
			break;
			@@ -119,6 +144,41 @@
			return Windows10BorderHandler::sharedEventFilter(obj, event);
			}

			bool BorderItem::nativeEventFilter(const QByteArray &eventType, void *message,
			QT_NATIVE_EVENT_RESULT_TYPE *result) {
			const auto msg = static_cast<const MSG *>(message);
			switch (msg->message) {
			case WM_THEMECHANGED:
			case WM_SYSCOLORCHANGE:
			case WM_DWMCOLORIZATIONCOLORCHANGED: {
			update();
			break;
			}

			case WM_SETTINGCHANGE: {
			if (isImmersiveColorSetChange(msg->wParam, msg->lParam)) {
			update();
			}
			break;
			}

			default:
			break;
			}
			return Windows10BorderHandler::nativeEventFilter(eventType, message, result);
			}

			void BorderItem::_q_afterSynchronizing() {
			if (needPaint) {
			needPaint = false;
			drawBorderNative();
			}
			}

			void BorderItem::_q_windowActivityChanged() {
			update();
			}

			void QuickWindowAgentPrivate::setupWindows10BorderWorkaround() {
			// Install painting hook
			auto ctx = context.get();