From 77f10f7c5eb8716c06eb7e0447c3fd8dbcb48d79 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周四, 21 12月 2023 23:18:58 +0800
Subject: [PATCH] minor tweaks

---
 src/core/contexts/abstractwindowcontext_p.h |   51 +++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index 2934b4d..f3e05a1 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -1,34 +1,44 @@
 #ifndef ABSTRACTWINDOWCONTEXT_P_H
 #define ABSTRACTWINDOWCONTEXT_P_H
 
+//
+//  W A R N I N G !!!
+//  -----------------
+//
+// This file is not part of the QWindowKit API. It is used purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or may even be removed.
+//
+
 #include <array>
 #include <memory>
 
 #include <QtCore/QSet>
+#include <QtCore/QPointer>
+#include <QtGui/QRegion>
 #include <QtGui/QWindow>
-#include <QtGui/QPolygon>
 
 #include <QWKCore/windowagentbase.h>
-#include <QWKCore/private/eventobserver_p.h>
+#include <QWKCore/private/nativeeventfilter_p.h>
 #include <QWKCore/private/windowitemdelegate_p.h>
 
 namespace QWK {
 
-    class QWK_CORE_EXPORT AbstractWindowContext : public QObject, public EventDispatcher {
+    class QWK_CORE_EXPORT AbstractWindowContext : public QObject, public NativeEventDispatcher {
         Q_OBJECT
     public:
         AbstractWindowContext();
         ~AbstractWindowContext() override;
 
     public:
-        bool setup(QObject *host, WindowItemDelegate *delegate);
+        void setup(QObject *host, WindowItemDelegate *delegate);
 
         inline QObject *host() const;
         inline QWindow *window() const;
+        inline WindowItemDelegate *delegate() const;
 
         inline bool isHitTestVisible(const QObject *obj) const;
         bool setHitTestVisible(const QObject *obj, bool visible);
-        bool setHitTestVisible(const QRect &rect, bool visible);
 
         inline QObject *systemButton(WindowAgentBase::SystemButton button) const;
         bool setSystemButton(WindowAgentBase::SystemButton button, QObject *obj);
@@ -36,7 +46,11 @@
         inline QObject *titleBar() const;
         bool setTitleBar(QObject *obj);
 
-        QRegion hitTestShape() const;
+#ifdef Q_OS_MAC
+        inline QRect systemButtonArea() const;
+        void setSystemButtonArea(const QRect &rect);
+#endif
+
         bool isInSystemButtons(const QPoint &pos, WindowAgentBase::SystemButton *button) const;
         bool isInTitleBarDraggableArea(const QPoint &pos) const;
 
@@ -44,16 +58,19 @@
 
         enum WindowContextHook {
             CentralizeHook = 1,
+            RaiseWindowHook,
             ShowSystemMenuHook,
             DefaultColorsHook,
-            DrawWindows10BorderHook, // Only works on Windows 10
+            DrawWindows10BorderHook,     // Only works on Windows 10
+            SystemButtonAreaChangedHook, // Only works on Mac
         };
         virtual void virtual_hook(int id, void *data);
 
         void showSystemMenu(const QPoint &pos);
+        void notifyWinIdChange();
 
     protected:
-        virtual bool setupHost() = 0;
+        virtual void winIdChanged() = 0;
 
     protected:
         QObject *m_host{};
@@ -61,14 +78,14 @@
         QWindow *m_windowHandle{};
 
         QSet<const QObject *> m_hitTestVisibleItems;
-        QList<QRect> m_hitTestVisibleRects;
+#ifdef Q_OS_MAC
+        QRect m_systemButtonArea;
+#endif
 
         QObject *m_titleBar{};
         std::array<QObject *, WindowAgentBase::NumSystemButton> m_systemButtons{};
 
-        // Cached shape
-        mutable bool hitTestVisibleShapeDirty{};
-        mutable QRegion hitTestVisibleShape;
+        std::unique_ptr<QObject> m_winIdChangeEventFilter;
     };
 
     inline QObject *AbstractWindowContext::host() const {
@@ -77,6 +94,10 @@
 
     inline QWindow *AbstractWindowContext::window() const {
         return m_windowHandle;
+    }
+
+    inline WindowItemDelegate *AbstractWindowContext::delegate() const {
+        return m_delegate.get();
     }
 
     inline bool AbstractWindowContext::isHitTestVisible(const QObject *obj) const {
@@ -92,6 +113,12 @@
         return m_titleBar;
     }
 
+#ifdef Q_OS_MAC
+    inline QRect AbstractWindowContext::systemButtonArea() const {
+        return m_systemButtonArea;
+    }
+#endif
+
 }
 
 #endif // ABSTRACTWINDOWCONTEXT_P_H

--
Gitblit v1.9.1