From bc6e2a4231d73d6e037340af9e73f2611649faa8 Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周四, 09 5月 2024 01:15:21 +0800
Subject: [PATCH] Optimize event filter forwarding

---
 src/core/contexts/abstractwindowcontext_p.h |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index 52eb5cc..27ee162 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -83,6 +83,9 @@
         virtual bool setWindowAttribute(const QString &key, const QVariant &attribute);
 
     protected:
+        bool eventFilter(QObject *obj, QEvent *event) override;
+
+    protected:
         virtual void winIdChanged(WId winId, WId oldWinId) = 0;
         virtual bool windowAttributeChanged(const QString &key, const QVariant &attribute,
                                             const QVariant &oldAttribute);
@@ -90,7 +93,7 @@
     protected:
         QObject *m_host{};
         std::unique_ptr<WindowItemDelegate> m_delegate;
-        QWindow *m_windowHandle{};
+        QPointer<QWindow> m_windowHandle;
         WId m_windowId{};
 
         QSet<const QObject *> m_hitTestVisibleItems;
@@ -102,8 +105,6 @@
         std::array<QObject *, WindowAgentBase::Close + 1> m_systemButtons{};
 
         QVariantHash m_windowAttributes;
-
-        std::unique_ptr<QObject> m_windowEventFilter;
         std::unique_ptr<WinIdChangeEventFilter> m_winIdChangeEventFilter;
     };
 

--
Gitblit v1.9.1