From 77f10f7c5eb8716c06eb7e0447c3fd8dbcb48d79 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: ćšć, 21 12æ 2023 23:18:58 +0800
Subject: [PATCH] minor tweaks
---
src/core/contexts/abstractwindowcontext_p.h | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index 3115141..f3e05a1 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -1,6 +1,15 @@
#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>
@@ -28,9 +37,6 @@
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);
@@ -55,7 +61,6 @@
RaiseWindowHook,
ShowSystemMenuHook,
DefaultColorsHook,
- WindowAttributeChangedHook,
DrawWindows10BorderHook, // Only works on Windows 10
SystemButtonAreaChangedHook, // Only works on Mac
};
@@ -65,7 +70,7 @@
void notifyWinIdChange();
protected:
- virtual void winIdChanged(QWindow *oldWindow) = 0;
+ virtual void winIdChanged() = 0;
protected:
QObject *m_host{};
@@ -80,7 +85,7 @@
QObject *m_titleBar{};
std::array<QObject *, WindowAgentBase::NumSystemButton> m_systemButtons{};
- QVariantHash m_windowAttributes;
+ std::unique_ptr<QObject> m_winIdChangeEventFilter;
};
inline QObject *AbstractWindowContext::host() const {
@@ -93,10 +98,6 @@
inline WindowItemDelegate *AbstractWindowContext::delegate() const {
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 {
--
Gitblit v1.9.1