From 51039917996909284fbc2d776a9b8f71fe5e6f9a Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周六, 02 12月 2023 17:43:17 +0800
Subject: [PATCH] wip
---
src/quick/quickwindowagent.cpp | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp
index d7f283d..1b653bb 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;
+ return false;
+ }
+
+ if (!d->setup(window, std::make_shared<QuickItemDelegate>())) {
+ return true;
}
d->host = window;
-
- d->setup(window, new QuickItemDelegate());
+ return true;
}
bool QuickWindowAgent::isHitTestVisible(QQuickItem *item) const {
Q_D(const QuickWindowAgent);
- return d->m_eventHandler->isHitTestVisible(item);
+ return d->eventHandler->isHitTestVisible(item);
}
void QuickWindowAgent::setHitTestVisible(QQuickItem *item, bool visible) {
Q_D(QuickWindowAgent);
- d->m_eventHandler->setHitTestVisible(item, visible);
+ d->eventHandler->setHitTestVisible(item, visible);
}
void QuickWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
Q_D(QuickWindowAgent);
- d->m_eventHandler->setHitTestVisible(rect, visible);
+ d->eventHandler->setHitTestVisible(rect, visible);
}
QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const {
Q_D(const QuickWindowAgent);
- return static_cast<QQuickItem *>(d->m_eventHandler->systemButton(button));
+ return qobject_cast<QQuickItem *>(d->eventHandler->systemButton(button));
}
void QuickWindowAgent::setSystemButton(SystemButton button, QQuickItem *item) {
Q_D(QuickWindowAgent);
- if (!d->m_eventHandler->setSystemButton(button, item)) {
+ if (!d->eventHandler->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 qobject_cast<QQuickItem *>(d->eventHandler->titleBar());
}
void QuickWindowAgent::setTitleBar(QQuickItem *item) {
Q_D(QuickWindowAgent);
- if (!d->m_eventHandler->setTitleBar(item)) {
+ if (!d->eventHandler->setTitleBar(item)) {
return;
}
Q_EMIT titleBarWidgetChanged(item);
--
Gitblit v1.9.1