From 40d73269371a9e2b142eb2be2bd2f70aff6346d2 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周日, 25 2月 2024 04:13:02 +0800
Subject: [PATCH] Better workaround for win10 top border issue
---
src/quick/quickwindowagent_win.cpp | 111 +++++++++++++++++++++++++++++--------------------------
1 files changed, 59 insertions(+), 52 deletions(-)
diff --git a/src/quick/quickwindowagent_win.cpp b/src/quick/quickwindowagent_win.cpp
index cfc3eb1..011dae0 100644
--- a/src/quick/quickwindowagent_win.cpp
+++ b/src/quick/quickwindowagent_win.cpp
@@ -1,37 +1,59 @@
+// Copyright (C) 2023-2024 Stdware Collections (https://www.github.com/stdware)
+// Copyright (C) 2021-2023 wangwenx190 (Yuhang Zhao)
+// SPDX-License-Identifier: Apache-2.0
+
#include "quickwindowagent_p.h"
#include <QtQuick/QQuickPaintedItem>
#include <QtQuick/private/qquickitem_p.h>
-#include <QWKCore/private/nativeeventfilter_p.h>
+#include <QWKCore/qwindowkit_windows.h>
+#include <QWKCore/private/windows10borderhandler_p.h>
namespace QWK {
- class BorderItem : public QQuickPaintedItem, public NativeEventFilter {
- Q_OBJECT
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
+
+ class DeferredDeleteHook;
+
+ class BorderItem : public QQuickPaintedItem, public Windows10BorderHandler {
public:
explicit BorderItem(QQuickItem *parent, AbstractWindowContext *context);
~BorderItem() override;
- void updateGeometry();
+ void updateGeometry() override;
public:
void paint(QPainter *painter) override;
void itemChange(ItemChange change, const ItemChangeData &data) override;
protected:
- bool nativeEventFilter(const QByteArray &eventType, void *message,
- QT_NATIVE_EVENT_RESULT_TYPE *result) override;
+ bool sharedEventFilter(QObject *obj, QEvent *event) override;
- AbstractWindowContext *context;
+ std::unique_ptr<DeferredDeleteHook> paintHook;
+ };
- private:
- void _q_windowActivityChanged();
+ class DeferredDeleteHook : public QObject {
+ public:
+ DeferredDeleteHook(BorderItem *item) : item(item) {
+ }
+
+ // Override deferred delete handler
+ bool event(QEvent *event) override {
+ if (event->type() == QEvent::DeferredDelete) {
+ item->drawBorder();
+ return true;
+ }
+ return QObject::event(event);
+ }
+
+ BorderItem *item;
};
BorderItem::BorderItem(QQuickItem *parent, AbstractWindowContext *context)
- : QQuickPaintedItem(parent), context(context) {
- setAntialiasing(true); // We needs anti-aliasing to give us better result.
+ : QQuickPaintedItem(parent), Windows10BorderHandler(context),
+ paintHook(std::make_unique<DeferredDeleteHook>(this)) {
+ 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
// semi-transparent borders of course.
@@ -42,29 +64,32 @@
anchors->setLeft(parentPri->left());
anchors->setRight(parentPri->right());
- setZ(9999); // Make sure our fake border always above everything in the window.
+ setZ(std::numeric_limits<qreal>::max()); // Make sure our fake border always above
+ // everything in the window.
- context->installNativeEventFilter(this);
- connect(window(), &QQuickWindow::activeChanged, this,
- &BorderItem::_q_windowActivityChanged);
- updateGeometry();
+ // First update
+ if (context->windowId()) {
+ setupNecessaryAttributes();
+ }
+ BorderItem::updateGeometry();
}
BorderItem::~BorderItem() = default;
void BorderItem::updateGeometry() {
- setHeight(context->property("borderThickness").toInt());
+ setHeight(borderThickness());
+ setVisible(isNormalWindow());
}
void BorderItem::paint(QPainter *painter) {
- QRect rect(QPoint(0, 0), size().toSize());
- QRegion region(rect);
- void *args[] = {
- painter,
- &rect,
- ®ion,
- };
- context->virtual_hook(AbstractWindowContext::DrawWindows10BorderHook, args);
+ 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();
}
void BorderItem::itemChange(ItemChange change, const ItemChangeData &data) {
@@ -80,45 +105,27 @@
}
}
- bool BorderItem::nativeEventFilter(const QByteArray &eventType, void *message,
- QT_NATIVE_EVENT_RESULT_TYPE *result) {
- Q_UNUSED(eventType)
- const auto msg = static_cast<const MSG *>(message);
- switch (msg->message) {
- case WM_THEMECHANGED:
- case WM_SYSCOLORCHANGE:
- case WM_DWMCOLORIZATIONCOLORCHANGED: {
- update();
+ bool BorderItem::sharedEventFilter(QObject *obj, QEvent *event) {
+ Q_UNUSED(obj)
+
+ switch (event->type()) {
+ case QEvent::WindowStateChange: {
+ updateGeometry();
break;
}
-
- case WM_SETTINGCHANGE: {
- if (!msg->wParam && msg->lParam &&
- std::wcscmp(reinterpret_cast<LPCWSTR>(msg->lParam), L"ImmersiveColorSet") ==
- 0) {
- update();
- }
- break;
- }
-
default:
break;
}
- return false;
- }
-
- void BorderItem::_q_windowActivityChanged() {
- update();
+ return Windows10BorderHandler::sharedEventFilter(obj, event);
}
void QuickWindowAgentPrivate::setupWindows10BorderWorkaround() {
// Install painting hook
auto ctx = context.get();
- if (ctx->property("needBorderPainter").toBool()) {
+ if (ctx->windowAttribute(QStringLiteral("win10-border-needed")).toBool()) {
std::ignore = new BorderItem(hostWindow->contentItem(), ctx);
}
}
+#endif
}
-
-#include "quickwindowagent_win.moc"
--
Gitblit v1.9.1