From 778e12cb0f0d3879a0ecf8bd6fd124dc4f1a7537 Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <zhaoyuhang@rankyee.com>
Date: 周一, 04 12月 2023 18:04:44 +0800
Subject: [PATCH] wip
---
src/quick/quickwindowagent.cpp | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp
index d7f283d..aae49f7 100644
--- a/src/quick/quickwindowagent.cpp
+++ b/src/quick/quickwindowagent.cpp
@@ -23,44 +23,47 @@
QuickWindowAgent::~QuickWindowAgent() {
}
- void QuickWindowAgent::setup(QQuickWindow *window) {
+ bool QuickWindowAgent::setup(QQuickWindow *window) {
Q_ASSERT(window);
if (!window) {
- return;
+ return false;
}
Q_D(QuickWindowAgent);
- if (d->host) {
- return;
+ if (d->hostWindow) {
+ return false;
}
- d->host = window;
- d->setup(window, new QuickItemDelegate());
+ if (!d->setup(window, new QuickItemDelegate())) {
+ return true;
+ }
+ d->hostWindow = window;
+ return true;
}
bool QuickWindowAgent::isHitTestVisible(QQuickItem *item) const {
Q_D(const QuickWindowAgent);
- return d->m_eventHandler->isHitTestVisible(item);
+ return d->context->isHitTestVisible(item);
}
void QuickWindowAgent::setHitTestVisible(QQuickItem *item, bool visible) {
Q_D(QuickWindowAgent);
- d->m_eventHandler->setHitTestVisible(item, visible);
+ d->context->setHitTestVisible(item, visible);
}
void QuickWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
Q_D(QuickWindowAgent);
- d->m_eventHandler->setHitTestVisible(rect, visible);
+ d->context->setHitTestVisible(rect, visible);
}
QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const {
Q_D(const QuickWindowAgent);
- return static_cast<QQuickItem *>(d->m_eventHandler->systemButton(button));
+ return static_cast<QQuickItem *>(d->context->systemButton(button));
}
void QuickWindowAgent::setSystemButton(SystemButton button, QQuickItem *item) {
Q_D(QuickWindowAgent);
- if (!d->m_eventHandler->setSystemButton(button, item)) {
+ if (!d->context->setSystemButton(button, item)) {
return;
}
Q_EMIT systemButtonChanged(button, item);
@@ -68,12 +71,12 @@
QQuickItem *QuickWindowAgent::titleBar() const {
Q_D(const QuickWindowAgent);
- return static_cast<QQuickItem *>(d->m_eventHandler->titleBar());
+ return static_cast<QQuickItem *>(d->context->titleBar());
}
void QuickWindowAgent::setTitleBar(QQuickItem *item) {
Q_D(QuickWindowAgent);
- if (!d->m_eventHandler->setTitleBar(item)) {
+ if (!d->context->setTitleBar(item)) {
return;
}
Q_EMIT titleBarWidgetChanged(item);
--
Gitblit v1.9.1