From a51b5688e1c33d3ce96b48c869603b00f908f513 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周三, 13 12月 2023 04:16:37 +0800
Subject: [PATCH] Make better code structure for border handlers
---
src/quick/quickwindowagent.cpp | 72 +-----------------------------------
1 files changed, 2 insertions(+), 70 deletions(-)
diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp
index 747daf0..9422f65 100644
--- a/src/quick/quickwindowagent.cpp
+++ b/src/quick/quickwindowagent.cpp
@@ -2,69 +2,11 @@
#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"
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() {
}
@@ -99,15 +41,7 @@
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())));
- }
+ d->setupWindows10BorderWorkaround();
#endif
return true;
}
@@ -158,6 +92,4 @@
d.init();
}
-}
-
-#include "quickwindowagent.moc"
\ No newline at end of file
+}
\ No newline at end of file
--
Gitblit v1.9.1