From ba8e8a32fc6e909ad0a2c152e36b6660c01fdad5 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周四, 21 11月 2024 21:24:24 +0800
Subject: [PATCH] Update qmake pri

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

diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index 04651ad..062494d 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
 
@@ -22,6 +26,7 @@
 #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 {
 
@@ -38,10 +43,11 @@
 
         inline QObject *host() const;
         inline QWindow *window() const;
+        inline WId windowId() const;
         inline WindowItemDelegate *delegate() const;
 
         inline bool isHitTestVisible(const QObject *obj) const;
-        bool setHitTestVisible(const QObject *obj, bool visible);
+        bool setHitTestVisible(QObject *obj, bool visible);
 
         inline QObject *systemButton(WindowAgentBase::SystemButton button) const;
         bool setSystemButton(WindowAgentBase::SystemButton button, QObject *obj);
@@ -50,12 +56,30 @@
         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;
         bool isInTitleBarDraggableArea(const QPoint &pos) const;
+
+        inline bool isHostWidthFixed() const {
+            return m_windowHandle
+                       ? ((m_windowHandle->flags() & Qt::MSWindowsFixedSizeDialogHint) ||
+                          m_windowHandle->minimumWidth() == m_windowHandle->maximumWidth())
+                       : false;
+        }
+        inline bool isHostHeightFixed() const {
+            return m_windowHandle
+                       ? ((m_windowHandle->flags() & Qt::MSWindowsFixedSizeDialogHint) ||
+                          m_windowHandle->minimumHeight() == m_windowHandle->maximumHeight())
+                       : false;
+        }
+        inline bool isHostSizeFixed() const {
+            return m_windowHandle ? ((m_windowHandle->flags() & Qt::MSWindowsFixedSizeDialogHint) ||
+                                     m_windowHandle->minimumSize() == m_windowHandle->maximumSize())
+                                  : false;
+        }
 
         virtual QString key() const;
 
@@ -77,27 +101,36 @@
         virtual bool setWindowAttribute(const QString &key, const QVariant &attribute);
 
     protected:
-        virtual void winIdChanged() = 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::Close + 1> m_systemButtons{};
 
         QVariantHash m_windowAttributes;
+        std::unique_ptr<WinIdChangeEventFilter> m_winIdChangeEventFilter;
+        
+        void removeSystemButtonsAndHitTestItems();
 
-        std::unique_ptr<QObject> m_windowEventFilter;
-        std::unique_ptr<QObject> m_winIdChangeEventFilter;
+    private:
+        void _q_titleBarDistroyed(QObject *obj);
+        void _q_hitTestVisibleItemDestroyed(QObject *obj);
+        void _q_systemButtonDestroyed(QObject *obj);
     };
 
     inline QObject *AbstractWindowContext::host() const {
@@ -106,6 +139,10 @@
 
     inline QWindow *AbstractWindowContext::window() const {
         return m_windowHandle;
+    }
+
+    inline WId AbstractWindowContext::windowId() const {
+        return m_windowId;
     }
 
     inline WindowItemDelegate *AbstractWindowContext::delegate() const {
@@ -126,8 +163,8 @@
     }
 
 #ifdef Q_OS_MAC
-    inline QRect AbstractWindowContext::systemButtonArea() const {
-        return m_systemButtonArea;
+    inline ScreenRectCallback AbstractWindowContext::systemButtonAreaCallback() const {
+        return m_systemButtonAreaCallback;
     }
 #endif
 

--
Gitblit v1.9.1