From 245ddfa1f01b4c9fa10337246b8045755e5bcce5 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 19 12月 2023 21:03:58 +0800
Subject: [PATCH] Change back to qScopeGuard
---
src/core/contexts/abstractwindowcontext_p.h | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index a86ddd8..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,11 +31,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 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);
@@ -48,17 +61,20 @@
enum WindowContextHook {
CentralizeHook = 1,
+ RaiseWindowHook,
ShowSystemMenuHook,
DefaultColorsHook,
+ 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{};
@@ -72,6 +88,8 @@
QObject *m_titleBar{};
std::array<QObject *, WindowAgentBase::NumSystemButton> m_systemButtons{};
+
+ QVariantHash m_windowAttributes;
};
inline QObject *AbstractWindowContext::host() const {
@@ -86,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);
}
--
Gitblit v1.9.1