From 2ccafcb1d891ed0fff4cc85729ca1faf5b7f1c96 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 19 12月 2023 17:59:15 +0800
Subject: [PATCH] Add private warnings and change pictures
---
src/core/contexts/abstractwindowcontext_p.h | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index db12f87..ecd2323 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -1,10 +1,20 @@
#ifndef ABSTRACTWINDOWCONTEXT_P_H
#define ABSTRACTWINDOWCONTEXT_P_H
+//
+// W A R N I N G !!!
+// -----------------
+//
+// This file is not part of the QWindowKit API. It is used purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or may even be removed.
+//
+
#include <array>
#include <memory>
#include <QtCore/QSet>
+#include <QtCore/QPointer>
#include <QtGui/QRegion>
#include <QtGui/QWindow>
@@ -21,15 +31,17 @@
~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 QVariant windowAttribute(const QString &key) const;
+ void setWindowAttribute(const QString &key, const QVariant &var);
+
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);
@@ -37,7 +49,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;
@@ -45,16 +61,20 @@
enum WindowContextHook {
CentralizeHook = 1,
+ RaiseWindowHook,
ShowSystemMenuHook,
DefaultColorsHook,
- DrawWindows10BorderHook, // Only works on Windows 10
+ WindowAttributeChangedHook,
+ 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{};
@@ -62,14 +82,14 @@
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;
+ QVariantHash m_windowAttributes;
};
inline QObject *AbstractWindowContext::host() const {
@@ -84,6 +104,10 @@
return m_delegate.get();
}
+ inline QVariant AbstractWindowContext::windowAttribute(const QString &key) const {
+ return m_windowAttributes.value(key);
+ }
+
inline bool AbstractWindowContext::isHitTestVisible(const QObject *obj) const {
return m_hitTestVisibleItems.contains(obj);
}
@@ -97,6 +121,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