From 564f33e8b29a6f73050f4da3f843b942aaf0d739 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周三, 08 5月 2024 19:36:16 +0800
Subject: [PATCH] Improve event filter handling

---
 src/core/contexts/abstractwindowcontext_p.h |   61 ++++++++++++++++--------------
 1 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index 1882369..27ee162 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -1,3 +1,7 @@
+// Copyright (C) 2023-2024 Stdware Collections (https://www.github.com/stdware)
+// Copyright (C) 2021-2023 wangwenx190 (Yuhang Zhao)
+// SPDX-License-Identifier: Apache-2.0
+
 #ifndef ABSTRACTWINDOWCONTEXT_P_H
 #define ABSTRACTWINDOWCONTEXT_P_H
 
@@ -20,11 +24,15 @@
 
 #include <QWKCore/windowagentbase.h>
 #include <QWKCore/private/nativeeventfilter_p.h>
+#include <QWKCore/private/sharedeventfilter_p.h>
 #include <QWKCore/private/windowitemdelegate_p.h>
+#include <QWKCore/private/winidchangeeventfilter_p.h>
 
 namespace QWK {
 
-    class QWK_CORE_EXPORT AbstractWindowContext : public QObject, public NativeEventDispatcher {
+    class QWK_CORE_EXPORT AbstractWindowContext : public QObject,
+                                                  public NativeEventDispatcher,
+                                                  public SharedEventDispatcher {
         Q_OBJECT
     public:
         AbstractWindowContext();
@@ -35,10 +43,8 @@
 
         inline QObject *host() const;
         inline QWindow *window() const;
+        inline WId windowId() const;
         inline WindowItemDelegate *delegate() const;
-
-        inline QVariant windowAttribute(const QString &key) const;
-        void setWindowAttribute(const QString &key, const QVariant &var);
 
         inline bool isHitTestVisible(const QObject *obj) const;
         bool setHitTestVisible(const QObject *obj, bool visible);
@@ -50,8 +56,8 @@
         bool setTitleBar(QObject *obj);
 
 #ifdef Q_OS_MAC
-        inline QRect systemButtonArea() const;
-        void setSystemButtonArea(const QRect &rect);
+        inline ScreenRectCallback systemButtonAreaCallback() const;
+        void setSystemButtonAreaCallback(const ScreenRectCallback &callback);
 #endif
 
         bool isInSystemButtons(const QPoint &pos, WindowAgentBase::SystemButton *button) const;
@@ -64,8 +70,8 @@
             RaiseWindowHook,
             ShowSystemMenuHook,
             DefaultColorsHook,
-            WindowAttributeChangedHook,
-            DrawWindows10BorderHook,     // Only works on Windows 10
+            DrawWindows10BorderHook,     // Only works on Windows 10, emulated workaround
+            DrawWindows10BorderHook2,    // Only works on Windows 10, native workaround
             SystemButtonAreaChangedHook, // Only works on Mac
         };
         virtual void virtual_hook(int id, void *data);
@@ -73,30 +79,33 @@
         void showSystemMenu(const QPoint &pos);
         void notifyWinIdChange();
 
-        inline bool isEnabled() const;
-        void setEnabled(bool enabled);
+        virtual QVariant windowAttribute(const QString &key) const;
+        virtual bool setWindowAttribute(const QString &key, const QVariant &attribute);
 
     protected:
-        virtual void winIdChanged(QWindow *oldWindow, bool isDestroyed) = 0;
+        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);
 
     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;
 #ifdef Q_OS_MAC
-        QRect m_systemButtonArea;
+        ScreenRectCallback m_systemButtonAreaCallback;
 #endif
 
         QObject *m_titleBar{};
-        std::array<QObject *, WindowAgentBase::NumSystemButton> m_systemButtons{};
+        std::array<QObject *, WindowAgentBase::Close + 1> m_systemButtons{};
 
         QVariantHash m_windowAttributes;
-
-    private:
-        bool m_internalEnabled = false;
-        QPointer<QWindow> m_windowHandleCache;
+        std::unique_ptr<WinIdChangeEventFilter> m_winIdChangeEventFilter;
     };
 
     inline QObject *AbstractWindowContext::host() const {
@@ -107,12 +116,12 @@
         return m_windowHandle;
     }
 
-    inline WindowItemDelegate *AbstractWindowContext::delegate() const {
-        return m_delegate.get();
+    inline WId AbstractWindowContext::windowId() const {
+        return m_windowId;
     }
 
-    inline QVariant AbstractWindowContext::windowAttribute(const QString &key) const {
-        return m_windowAttributes.value(key);
+    inline WindowItemDelegate *AbstractWindowContext::delegate() const {
+        return m_delegate.get();
     }
 
     inline bool AbstractWindowContext::isHitTestVisible(const QObject *obj) const {
@@ -129,14 +138,10 @@
     }
 
 #ifdef Q_OS_MAC
-    inline QRect AbstractWindowContext::systemButtonArea() const {
-        return m_systemButtonArea;
+    inline ScreenRectCallback AbstractWindowContext::systemButtonAreaCallback() const {
+        return m_systemButtonAreaCallback;
     }
 #endif
-
-    inline bool AbstractWindowContext::isEnabled() const {
-        return m_internalEnabled;
-    }
 
 }
 

--
Gitblit v1.9.1