From 0586c98f90866e4bc9f0dfe73aefb0a07c56697e Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 12 12月 2023 15:44:14 +0800
Subject: [PATCH] Add win10 border handler
---
src/quick/quickwindowagent.cpp | 98 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 86 insertions(+), 12 deletions(-)
diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp
index 80c10e3..747daf0 100644
--- a/src/quick/quickwindowagent.cpp
+++ b/src/quick/quickwindowagent.cpp
@@ -1,11 +1,70 @@
#include "quickwindowagent.h"
#include "quickwindowagent_p.h"
+#include <QtQuick/QQuickWindow>
+#include <QtQuick/QQuickPaintedItem>
+#include <QtQuick/private/qquickitem_p.h>
+#include <QtQuick/private/qquickanchors_p.h>
+
+#ifdef Q_OS_WINDOWS
+# include <QWKCore/private/win10borderhandler_p.h>
+#endif
+
#include "quickitemdelegate_p.h"
-#include <QtQuick/QQuickWindow>
-
namespace QWK {
+
+ class BorderItem : public QQuickPaintedItem, public Win10BorderHandler {
+ Q_OBJECT
+ public:
+ explicit BorderItem(QQuickItem *parent = nullptr);
+ ~BorderItem() override;
+
+ void updateGeometry() override;
+ void requestUpdate() override;
+
+ bool isActive() const override;
+
+ public:
+ void paint(QPainter *painter) override;
+ };
+
+ BorderItem::BorderItem(QQuickItem *parent)
+ : Win10BorderHandler(parent->window()), QQuickPaintedItem(parent) {
+ setAntialiasing(true); // ### FIXME: do we need to enable or disable this?
+ setMipmap(true); // ### FIXME: do we need to enable or disable this?
+ setFillColor({}); // Will improve the performance a little bit.
+ setOpaquePainting(true); // Will also improve the performance, we don't draw
+ // semi-transparent borders of course.
+
+ auto parentPri = QQuickItemPrivate::get(parent);
+ auto anchors = QQuickItemPrivate::get(this)->anchors();
+ anchors->setTop(parentPri->top());
+ anchors->setLeft(parentPri->left());
+ anchors->setRight(parentPri->right());
+
+ setZ(10);
+ }
+
+ BorderItem::~BorderItem() = default;
+
+ void BorderItem::updateGeometry() {
+ setHeight(m_borderThickness);
+ }
+
+ void BorderItem::requestUpdate() {
+ update();
+ }
+
+ bool BorderItem::isActive() const {
+ return static_cast<QQuickWindow *>(m_window)->isActive();
+ }
+
+ void BorderItem::paint(QPainter *painter) {
+ QRect rect(QPoint(0, 0), size().toSize());
+ QRegion region(rect);
+ Win10BorderHandler::paintBorder(*painter, rect, region);
+ }
QuickWindowAgentPrivate::QuickWindowAgentPrivate() {
}
@@ -35,18 +94,30 @@
}
if (!d->setup(window, new QuickItemDelegate())) {
- return true;
+ return false;
}
d->hostWindow = window;
+
+#ifdef Q_OS_WINDOWS
+ // Install painting hook
+ if (bool needPaintBorder;
+ QMetaObject::invokeMethod(d->context.get(), "needWin10BorderHandler",
+ Qt::DirectConnection, Q_RETURN_ARG(bool, needPaintBorder)),
+ needPaintBorder) {
+ QMetaObject::invokeMethod(
+ d->context.get(), "setWin10BorderHandler", Qt::DirectConnection,
+ Q_ARG(Win10BorderHandler *, new BorderItem(window->contentItem())));
+ }
+#endif
return true;
}
- const QQuickItem *QuickWindowAgent::titleBar() const {
+ QQuickItem *QuickWindowAgent::titleBar() const {
Q_D(const QuickWindowAgent);
- return static_cast<const QQuickItem *>(d->context->titleBar());
+ return static_cast<QQuickItem *>(d->context->titleBar());
}
- void QuickWindowAgent::setTitleBar(const QQuickItem *item) {
+ void QuickWindowAgent::setTitleBar(QQuickItem *item) {
Q_D(QuickWindowAgent);
if (!d->context->setTitleBar(item)) {
return;
@@ -54,12 +125,12 @@
Q_EMIT titleBarWidgetChanged(item);
}
- const QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const {
+ QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const {
Q_D(const QuickWindowAgent);
- return static_cast<const QQuickItem *>(d->context->systemButton(button));
+ return static_cast<QQuickItem *>(d->context->systemButton(button));
}
- void QuickWindowAgent::setSystemButton(SystemButton button, const QQuickItem *item) {
+ void QuickWindowAgent::setSystemButton(SystemButton button, QQuickItem *item) {
Q_D(QuickWindowAgent);
if (!d->context->setSystemButton(button, item)) {
return;
@@ -72,18 +143,21 @@
return d->context->isHitTestVisible(item);
}
- void QuickWindowAgent::setHitTestVisible(const QQuickItem *item, bool visible) {
+ void QuickWindowAgent::setHitTestVisible_item(const QQuickItem *item, bool visible) {
Q_D(QuickWindowAgent);
d->context->setHitTestVisible(item, visible);
}
- void QuickWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
+ void QuickWindowAgent::setHitTestVisible_rect(const QRect &rect, bool visible) {
Q_D(QuickWindowAgent);
d->context->setHitTestVisible(rect, visible);
}
QuickWindowAgent::QuickWindowAgent(QuickWindowAgentPrivate &d, QObject *parent)
- : CoreWindowAgent(d, parent) {
+ : WindowAgentBase(d, parent) {
d.init();
}
+
}
+
+#include "quickwindowagent.moc"
\ No newline at end of file
--
Gitblit v1.9.1