From 2df00b7e7bf5fd9c2f171449f71d1b101480f0db Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周一, 11 12月 2023 20:24:24 +0800
Subject: [PATCH] finish border paint code
---
src/quick/quickwindowagent.cpp | 68 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp
index 3e22883..2bc9bca 100644
--- a/src/quick/quickwindowagent.cpp
+++ b/src/quick/quickwindowagent.cpp
@@ -1,6 +1,5 @@
#include "quickwindowagent.h"
#include "quickwindowagent_p.h"
-
#include "quickitemdelegate_p.h"
#include <QtQuick/QQuickWindow>
@@ -30,60 +29,61 @@
}
Q_D(QuickWindowAgent);
- if (d->host) {
+ if (d->hostWindow) {
return false;
}
if (!d->setup(window, new QuickItemDelegate())) {
return true;
}
- d->host = window;
+ d->hostWindow = window;
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();
}
+
}
--
Gitblit v1.9.1