From d3d7430ec9afb94abaf78fa2c9edd9d9f946881c Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周一, 18 12月 2023 01:29:07 +0800
Subject: [PATCH] Add QtContext WinIdChange workaround
---
src/core/contexts/abstractwindowcontext_p.h | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index bcc6ae8..3938d75 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -5,6 +5,7 @@
#include <memory>
#include <QtCore/QSet>
+#include <QtCore/QPointer>
#include <QtGui/QRegion>
#include <QtGui/QWindow>
@@ -21,14 +22,14 @@
~AbstractWindowContext() override;
public:
- bool setup(QObject *host, WindowItemDelegate *delegate);
+ void setup(QObject *host, WindowItemDelegate *delegate);
inline QObject *host() const;
inline QWindow *window() const;
+ inline WindowItemDelegate *delegate() const;
inline bool isHitTestVisible(const QObject *obj) const;
bool setHitTestVisible(const QObject *obj, bool visible);
- bool setHitTestVisible(const QRect &rect, bool visible);
inline QObject *systemButton(WindowAgentBase::SystemButton button) const;
bool setSystemButton(WindowAgentBase::SystemButton button, QObject *obj);
@@ -36,7 +37,11 @@
inline QObject *titleBar() const;
bool setTitleBar(QObject *obj);
- QRegion hitTestShape() const;
+#ifdef Q_OS_MAC
+ inline QRect systemButtonArea() const;
+ void setSystemButtonArea(const QRect &rect);
+#endif
+
bool isInSystemButtons(const QPoint &pos, WindowAgentBase::SystemButton *button) const;
bool isInTitleBarDraggableArea(const QPoint &pos) const;
@@ -46,14 +51,16 @@
CentralizeHook = 1,
ShowSystemMenuHook,
DefaultColorsHook,
- DrawWindows10BorderHook, // Only works on Windows 10
+ DrawWindows10BorderHook, // Only works on Windows 10
+ SystemButtonAreaChangedHook, // Only works on Mac
};
virtual void virtual_hook(int id, void *data);
void showSystemMenu(const QPoint &pos);
+ void notifyWinIdChange();
protected:
- virtual bool setupHost() = 0;
+ virtual void winIdChanged(QWindow *oldWindow) = 0;
protected:
QObject *m_host{};
@@ -61,14 +68,12 @@
QWindow *m_windowHandle{};
QSet<const QObject *> m_hitTestVisibleItems;
- QList<QRect> m_hitTestVisibleRects;
+#ifdef Q_OS_MAC
+ QRect m_systemButtonArea;
+#endif
QObject *m_titleBar{};
std::array<QObject *, WindowAgentBase::NumSystemButton> m_systemButtons{};
-
- // Cached shape
- mutable bool hitTestVisibleShapeDirty{};
- mutable QRegion hitTestVisibleShape;
};
inline QObject *AbstractWindowContext::host() const {
@@ -77,6 +82,10 @@
inline QWindow *AbstractWindowContext::window() const {
return m_windowHandle;
+ }
+
+ inline WindowItemDelegate *AbstractWindowContext::delegate() const {
+ return m_delegate.get();
}
inline bool AbstractWindowContext::isHitTestVisible(const QObject *obj) const {
@@ -92,6 +101,12 @@
return m_titleBar;
}
+#ifdef Q_OS_MAC
+ inline QRect AbstractWindowContext::systemButtonArea() const {
+ return m_systemButtonArea;
+ }
+#endif
+
}
#endif // ABSTRACTWINDOWCONTEXT_P_H
--
Gitblit v1.9.1