From a9c357c40d29e9a7ea59ffa80214657ef58c7dbe Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周一, 27 5月 2024 23:18:42 +0800
Subject: [PATCH] Fix typo
---
src/core/contexts/abstractwindowcontext_p.h | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index c35d306..e2b8f4b 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -26,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 {
@@ -42,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;
@@ -60,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;
@@ -81,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
@@ -99,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 {
@@ -112,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