From eda513356b8eb58b3069ddceb8c3dbc63c7fcdcd Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周日, 17 12月 2023 15:58:49 +0800
Subject: [PATCH] Update resources
---
src/core/contexts/abstractwindowcontext_p.h | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index 3c04073..a86ddd8 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -5,15 +5,16 @@
#include <memory>
#include <QtCore/QSet>
+#include <QtGui/QRegion>
#include <QtGui/QWindow>
-#include <QtGui/QPolygon>
#include <QWKCore/windowagentbase.h>
+#include <QWKCore/private/nativeeventfilter_p.h>
#include <QWKCore/private/windowitemdelegate_p.h>
namespace QWK {
- class QWK_CORE_EXPORT AbstractWindowContext : public QObject {
+ class QWK_CORE_EXPORT AbstractWindowContext : public QObject, public NativeEventDispatcher {
Q_OBJECT
public:
AbstractWindowContext();
@@ -24,10 +25,10 @@
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);
@@ -35,9 +36,11 @@
inline QObject *titleBar() const;
bool setTitleBar(QObject *obj);
- void showSystemMenu(const QPoint &pos);
+#ifdef Q_OS_MAC
+ inline QRect systemButtonArea() const;
+ void setSystemButtonArea(const QRect &rect);
+#endif
- QRegion hitTestShape() const;
bool isInSystemButtons(const QPoint &pos, WindowAgentBase::SystemButton *button) const;
bool isInTitleBarDraggableArea(const QPoint &pos) const;
@@ -46,29 +49,29 @@
enum WindowContextHook {
CentralizeHook = 1,
ShowSystemMenuHook,
- NeedsDrawBordersHook,
- DrawBordersHook,
- QueryBorderThicknessHook
+ DefaultColorsHook,
+ DrawWindows10BorderHook, // Only works on Windows 10
+ SystemButtonAreaChangedHook, // Only works on Mac
};
virtual void virtual_hook(int id, void *data);
+
+ void showSystemMenu(const QPoint &pos);
protected:
virtual bool setupHost() = 0;
protected:
- QObject *m_host;
+ QObject *m_host{};
std::unique_ptr<WindowItemDelegate> m_delegate;
- QWindow *m_windowHandle;
+ 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 +80,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 +99,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