From 129c32448fa36482c46ae9645e18a62722a04e53 Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周三, 06 12月 2023 18:27:56 +0800
Subject: [PATCH] Revert "fix mem leak"
---
src/quick/quickwindowagent.cpp | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp
index a1bbeb6..80c10e3 100644
--- a/src/quick/quickwindowagent.cpp
+++ b/src/quick/quickwindowagent.cpp
@@ -30,56 +30,56 @@
}
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 {
+ const QQuickItem *QuickWindowAgent::titleBar() const {
Q_D(const QuickWindowAgent);
- return d->m_eventHandler->isHitTestVisible(item);
+ return static_cast<const QQuickItem *>(d->context->titleBar());
}
- void QuickWindowAgent::setHitTestVisible(QQuickItem *item, bool visible) {
+ void QuickWindowAgent::setTitleBar(const QQuickItem *item) {
Q_D(QuickWindowAgent);
- d->m_eventHandler->setHitTestVisible(item, visible);
+ if (!d->context->setTitleBar(item)) {
+ return;
+ }
+ Q_EMIT titleBarWidgetChanged(item);
}
- void QuickWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
- Q_D(QuickWindowAgent);
- d->m_eventHandler->setHitTestVisible(rect, visible);
- }
-
- QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const {
+ const QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const {
Q_D(const QuickWindowAgent);
- return static_cast<QQuickItem *>(d->m_eventHandler->systemButton(button));
+ return static_cast<const QQuickItem *>(d->context->systemButton(button));
}
- void QuickWindowAgent::setSystemButton(SystemButton button, QQuickItem *item) {
+ void QuickWindowAgent::setSystemButton(SystemButton button, const QQuickItem *item) {
Q_D(QuickWindowAgent);
- if (!d->m_eventHandler->setSystemButton(button, item)) {
+ if (!d->context->setSystemButton(button, item)) {
return;
}
Q_EMIT systemButtonChanged(button, item);
}
- QQuickItem *QuickWindowAgent::titleBar() const {
+ bool QuickWindowAgent::isHitTestVisible(const QQuickItem *item) const {
Q_D(const QuickWindowAgent);
- return static_cast<QQuickItem *>(d->m_eventHandler->titleBar());
+ return d->context->isHitTestVisible(item);
}
- void QuickWindowAgent::setTitleBar(QQuickItem *item) {
+ void QuickWindowAgent::setHitTestVisible(const QQuickItem *item, bool visible) {
Q_D(QuickWindowAgent);
- if (!d->m_eventHandler->setTitleBar(item)) {
- return;
- }
- Q_EMIT titleBarWidgetChanged(item);
+ d->context->setHitTestVisible(item, visible);
+ }
+
+ void QuickWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
+ Q_D(QuickWindowAgent);
+ d->context->setHitTestVisible(rect, visible);
}
QuickWindowAgent::QuickWindowAgent(QuickWindowAgentPrivate &d, QObject *parent)
--
Gitblit v1.9.1