From 3e942c3dc8955be577079fbc028ce216e1c594b2 Mon Sep 17 00:00:00 2001
From: SineStriker <55847490+SineStriker@users.noreply.github.com>
Date: 周二, 11 2月 2025 19:07:53 +0800
Subject: [PATCH] Fix numerous bugs (#162)
---
src/core/contexts/abstractwindowcontext_p.h | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index e7711d7..e978cb4 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -15,7 +15,9 @@
//
#include <array>
+#include <list>
#include <memory>
+#include <utility>
#include <QtCore/QSet>
#include <QtCore/QPointer>
@@ -43,10 +45,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);
@@ -62,6 +65,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 {
@@ -69,9 +90,9 @@
RaiseWindowHook,
ShowSystemMenuHook,
DefaultColorsHook,
- DrawWindows10BorderHook, // Only works on Windows 10, emulated workaround
- DrawWindows10BorderHook2, // Only works on Windows 10, native workaround
- SystemButtonAreaChangedHook, // Only works on Mac
+ DrawWindows10BorderHook_Emulated, // Only works on Windows 10, emulated workaround
+ DrawWindows10BorderHook_Native, // Only works on Windows 10, native workaround
+ SystemButtonAreaChangedHook, // Only works on Mac
};
virtual void virtual_hook(int id, void *data);
@@ -82,6 +103,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);
@@ -89,7 +113,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;
@@ -100,10 +124,17 @@
QObject *m_titleBar{};
std::array<QObject *, WindowAgentBase::Close + 1> m_systemButtons{};
- QVariantHash m_windowAttributes;
+ std::list<std::pair<QString, QVariant>> m_windowAttributesOrder;
+ QHash<QString, decltype(m_windowAttributesOrder)::iterator> m_windowAttributes;
- std::unique_ptr<QObject> m_windowEventFilter;
std::unique_ptr<WinIdChangeEventFilter> m_winIdChangeEventFilter;
+
+ void removeSystemButtonsAndHitTestItems();
+
+ private:
+ void _q_titleBarDistroyed(QObject *obj);
+ void _q_hitTestVisibleItemDestroyed(QObject *obj);
+ void _q_systemButtonDestroyed(QObject *obj);
};
inline QObject *AbstractWindowContext::host() const {
@@ -114,6 +145,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