From 3fbcf1aa8f91a804af50fad4e2b122f698259c94 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周四, 09 5月 2024 23:45:28 +0800
Subject: [PATCH] Remove `isHostSizeFixed` in delegate

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

diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index f375b83..e2b8f4b 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,6 +43,7 @@
 
         inline QObject *host() const;
         inline QWindow *window() const;
+        inline WId windowId() const;
         inline WindowItemDelegate *delegate() const;
 
         inline bool isHitTestVisible(const QObject *obj) const;
@@ -56,6 +62,24 @@
 
         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,14 +101,18 @@
         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
@@ -95,9 +123,7 @@
         std::array<QObject *, WindowAgentBase::Close + 1> m_systemButtons{};
 
         QVariantHash m_windowAttributes;
-
-        std::unique_ptr<QObject> m_windowEventFilter;
-        std::unique_ptr<QObject> m_winIdChangeEventFilter;
+        std::unique_ptr<WinIdChangeEventFilter> m_winIdChangeEventFilter;
     };
 
     inline QObject *AbstractWindowContext::host() const {
@@ -108,6 +134,10 @@
         return m_windowHandle;
     }
 
+    inline WId AbstractWindowContext::windowId() const {
+        return m_windowId;
+    }
+
     inline WindowItemDelegate *AbstractWindowContext::delegate() const {
         return m_delegate.get();
     }

--
Gitblit v1.9.1