From 6f6f96909e7ded6ae3a4e59d9d4b62fa593abb23 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周日, 25 2月 2024 02:33:03 +0800
Subject: [PATCH] Fix quick initialization failure

---
 src/core/contexts/abstractwindowcontext_p.h |   62 ++++++++++++++++++++++++++++--
 1 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index be5ab36..52eb5cc 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -1,30 +1,49 @@
+// 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
+
+//
+//  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 <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();
         ~AbstractWindowContext() override;
 
     public:
-        bool setup(QObject *host, WindowItemDelegate *delegate);
+        void setup(QObject *host, WindowItemDelegate *delegate);
 
         inline QObject *host() const;
         inline QWindow *window() const;
+        inline WId windowId() const;
         inline WindowItemDelegate *delegate() const;
 
         inline bool isHitTestVisible(const QObject *obj) const;
@@ -36,6 +55,11 @@
         inline QObject *titleBar() const;
         bool setTitleBar(QObject *obj);
 
+#ifdef Q_OS_MAC
+        inline ScreenRectCallback systemButtonAreaCallback() const;
+        void setSystemButtonAreaCallback(const ScreenRectCallback &callback);
+#endif
+
         bool isInSystemButtons(const QPoint &pos, WindowAgentBase::SystemButton *button) const;
         bool isInTitleBarDraggableArea(const QPoint &pos) const;
 
@@ -43,26 +67,44 @@
 
         enum WindowContextHook {
             CentralizeHook = 1,
+            RaiseWindowHook,
             ShowSystemMenuHook,
             DefaultColorsHook,
-            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);
 
         void showSystemMenu(const QPoint &pos);
+        void notifyWinIdChange();
+
+        virtual QVariant windowAttribute(const QString &key) const;
+        virtual bool setWindowAttribute(const QString &key, const QVariant &attribute);
 
     protected:
-        virtual bool setupHost() = 0;
+        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{};
+        WId m_windowId{};
 
         QSet<const QObject *> m_hitTestVisibleItems;
+#ifdef Q_OS_MAC
+        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;
+
+        std::unique_ptr<QObject> m_windowEventFilter;
+        std::unique_ptr<WinIdChangeEventFilter> m_winIdChangeEventFilter;
     };
 
     inline QObject *AbstractWindowContext::host() const {
@@ -71,6 +113,10 @@
 
     inline QWindow *AbstractWindowContext::window() const {
         return m_windowHandle;
+    }
+
+    inline WId AbstractWindowContext::windowId() const {
+        return m_windowId;
     }
 
     inline WindowItemDelegate *AbstractWindowContext::delegate() const {
@@ -90,6 +136,12 @@
         return m_titleBar;
     }
 
+#ifdef Q_OS_MAC
+    inline ScreenRectCallback AbstractWindowContext::systemButtonAreaCallback() const {
+        return m_systemButtonAreaCallback;
+    }
+#endif
+
 }
 
 #endif // ABSTRACTWINDOWCONTEXT_P_H

--
Gitblit v1.9.1