From 5dbf2d71aa0aa6b8f0cb8f1334d061e0d759caf8 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周一, 11 12月 2023 22:18:38 +0800
Subject: [PATCH] Add workaround handling misplace
---
src/quick/quickwindowagent.cpp | 153 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 117 insertions(+), 36 deletions(-)
diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp
index 1b653bb..180779b 100644
--- a/src/quick/quickwindowagent.cpp
+++ b/src/quick/quickwindowagent.cpp
@@ -1,11 +1,83 @@
#include "quickwindowagent.h"
#include "quickwindowagent_p.h"
-
#include "quickitemdelegate_p.h"
#include <QtQuick/QQuickWindow>
+#include <QtQuick/QQuickPaintedItem>
+#include <QtQuick/private/qquickitem_p.h>
+#include <QtQuick/private/qquickanchors_p.h>
namespace QWK {
+
+ class BorderItem : public QQuickPaintedItem {
+ Q_OBJECT
+
+ public:
+ explicit BorderItem(AbstractWindowContext *ctx, QQuickItem *parent = nullptr);
+ ~BorderItem() override;
+
+ void updateHeight();
+
+ void paint(QPainter *painter) override;
+
+ void itemChange(ItemChange change, const ItemChangeData &data) override;
+
+ private:
+ AbstractWindowContext *context;
+ };
+
+ BorderItem::BorderItem(AbstractWindowContext *ctx, QQuickItem *parent) : QQuickPaintedItem(parent), context(ctx) {
+ 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::updateHeight() {
+ bool native = false;
+ quint32 thickness = 0;
+ void *args[] = { &native, &thickness };
+ context->virtual_hook(AbstractWindowContext::QueryBorderThicknessHook, &args);
+ setHeight(thickness);
+ }
+
+ void BorderItem::paint(QPainter *painter) {
+ auto rect = QRect{ QPoint{ 0, 0}, size().toSize() };
+ auto region = QRegion{ rect };
+ void *args[] = {
+ painter,
+ &rect,
+ ®ion
+ };
+ context->virtual_hook(AbstractWindowContext::DrawBordersHook, args);
+ }
+
+ void BorderItem::itemChange(ItemChange change, const ItemChangeData &data) {
+ QQuickPaintedItem::itemChange(change, data);
+ switch (change) {
+ case ItemSceneChange:
+ if (data.window) {
+ connect(data.window, &QQuickWindow::activeChanged, this, [this](){ update(); });
+ }
+ Q_FALLTHROUGH();
+ case ItemVisibleHasChanged:
+ case ItemDevicePixelRatioHasChanged:
+ updateHeight();
+ break;
+ default:
+ break;
+ }
+ }
QuickWindowAgentPrivate::QuickWindowAgentPrivate() {
}
@@ -30,60 +102,69 @@
}
Q_D(QuickWindowAgent);
- if (d->host) {
+ if (d->hostWindow) {
return false;
}
- if (!d->setup(window, std::make_shared<QuickItemDelegate>())) {
- return true;
+ if (!d->setup(window, new QuickItemDelegate())) {
+ return false;
}
- d->host = window;
+ d->hostWindow = window;
+
+ if (bool needPaintBorder = false;
+ d->context->virtual_hook(AbstractWindowContext::NeedsDrawBordersHook, &needPaintBorder),
+ needPaintBorder) {
+ d->borderItem = std::make_unique<BorderItem>(d->context.get(), window->contentItem());
+ }
return true;
- }
-
- bool QuickWindowAgent::isHitTestVisible(QQuickItem *item) const {
- Q_D(const QuickWindowAgent);
- return d->eventHandler->isHitTestVisible(item);
- }
-
- void QuickWindowAgent::setHitTestVisible(QQuickItem *item, bool visible) {
- Q_D(QuickWindowAgent);
- d->eventHandler->setHitTestVisible(item, visible);
- }
-
- void QuickWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
- Q_D(QuickWindowAgent);
- d->eventHandler->setHitTestVisible(rect, visible);
- }
-
- QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const {
- Q_D(const QuickWindowAgent);
- return qobject_cast<QQuickItem *>(d->eventHandler->systemButton(button));
- }
-
- void QuickWindowAgent::setSystemButton(SystemButton button, QQuickItem *item) {
- Q_D(QuickWindowAgent);
- if (!d->eventHandler->setSystemButton(button, item)) {
- return;
- }
- Q_EMIT systemButtonChanged(button, item);
}
QQuickItem *QuickWindowAgent::titleBar() const {
Q_D(const QuickWindowAgent);
- return qobject_cast<QQuickItem *>(d->eventHandler->titleBar());
+ return static_cast<QQuickItem *>(d->context->titleBar());
}
void QuickWindowAgent::setTitleBar(QQuickItem *item) {
Q_D(QuickWindowAgent);
- if (!d->eventHandler->setTitleBar(item)) {
+ if (!d->context->setTitleBar(item)) {
return;
}
Q_EMIT titleBarWidgetChanged(item);
}
+ QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const {
+ Q_D(const QuickWindowAgent);
+ return static_cast<QQuickItem *>(d->context->systemButton(button));
+ }
+
+ void QuickWindowAgent::setSystemButton(SystemButton button, QQuickItem *item) {
+ Q_D(QuickWindowAgent);
+ if (!d->context->setSystemButton(button, item)) {
+ return;
+ }
+ Q_EMIT systemButtonChanged(button, item);
+ }
+
+ bool QuickWindowAgent::isHitTestVisible(const QQuickItem *item) const {
+ Q_D(const QuickWindowAgent);
+ return d->context->isHitTestVisible(item);
+ }
+
+ void QuickWindowAgent::setHitTestVisible_item(const QQuickItem *item, bool visible) {
+ Q_D(QuickWindowAgent);
+ d->context->setHitTestVisible(item, 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