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 | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index 52eb5cc..e2b8f4b 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -63,6 +63,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;
enum WindowContextHook {
@@ -83,6 +101,9 @@
virtual bool setWindowAttribute(const QString &key, const QVariant &attribute);
protected:
+ 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);
@@ -90,7 +111,7 @@
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;
@@ -102,8 +123,6 @@
std::array<QObject *, WindowAgentBase::Close + 1> m_systemButtons{};
QVariantHash m_windowAttributes;
-
- std::unique_ptr<QObject> m_windowEventFilter;
std::unique_ptr<WinIdChangeEventFilter> m_winIdChangeEventFilter;
};
--
Gitblit v1.9.1