From 1408d89b225c822c9aca14bfa12a1ffc6cff722b Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <zhaoyuhang@rankyee.com>
Date: 周四, 07 12月 2023 17:43:18 +0800
Subject: [PATCH] remove not needed assert checks

---
 src/quick/quickwindowagent.cpp |   55 ++++++++++++++++++++++++++++++-------------------------
 1 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp
index 1b653bb..be70ca6 100644
--- a/src/quick/quickwindowagent.cpp
+++ b/src/quick/quickwindowagent.cpp
@@ -1,9 +1,10 @@
 #include "quickwindowagent.h"
 #include "quickwindowagent_p.h"
 
-#include "quickitemdelegate_p.h"
-
 #include <QtQuick/QQuickWindow>
+
+#include "quickitemdelegate_p.h"
+#include "quickwindowcontext_p.h"
 
 namespace QWK {
 
@@ -14,6 +15,10 @@
     }
 
     void QuickWindowAgentPrivate::init() {
+    }
+
+    AbstractWindowContext *QuickWindowAgentPrivate::createContext() const {
+        return new QuickWindowContext();
     }
 
     QuickWindowAgent::QuickWindowAgent(QObject *parent)
@@ -30,56 +35,56 @@
         }
 
         Q_D(QuickWindowAgent);
-        if (d->host) {
+        if (d->hostWindow) {
             return false;
         }
 
-        if (!d->setup(window, std::make_shared<QuickItemDelegate>())) {
+        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->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->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->eventHandler->setHitTestVisible(rect, visible);
-    }
-
-    QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const {
+    const QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const {
         Q_D(const QuickWindowAgent);
-        return qobject_cast<QQuickItem *>(d->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->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 qobject_cast<QQuickItem *>(d->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->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