From c8a5a82994e513acb00ba0e1f0b882ccbb18a6db Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 26 12月 2023 05:15:47 +0800
Subject: [PATCH] clean code
---
src/core/contexts/abstractwindowcontext_p.h | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index 29f6749..04651ad 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>
@@ -11,11 +20,14 @@
#include <QWKCore/windowagentbase.h>
#include <QWKCore/private/nativeeventfilter_p.h>
+#include <QWKCore/private/sharedeventfilter_p.h>
#include <QWKCore/private/windowitemdelegate_p.h>
namespace QWK {
- class QWK_CORE_EXPORT AbstractWindowContext : public QObject, public NativeEventDispatcher {
+ class QWK_CORE_EXPORT AbstractWindowContext : public QObject,
+ public NativeEventDispatcher,
+ public SharedEventDispatcher {
Q_OBJECT
public:
AbstractWindowContext();
@@ -49,9 +61,11 @@
enum WindowContextHook {
CentralizeHook = 1,
+ RaiseWindowHook,
ShowSystemMenuHook,
DefaultColorsHook,
- DrawWindows10BorderHook, // Only works on Windows 10
+ DrawWindows10BorderHook, // Only works on Windows 10, emulated workaround
+ DrawWindows10BorderHook2, // Only works on Windows 10, native workaround
SystemButtonAreaChangedHook, // Only works on Mac
};
virtual void virtual_hook(int id, void *data);
@@ -59,14 +73,18 @@
void showSystemMenu(const QPoint &pos);
void notifyWinIdChange();
+ virtual QVariant windowAttribute(const QString &key) const;
+ virtual bool setWindowAttribute(const QString &key, const QVariant &attribute);
+
protected:
- virtual void winIdChanged(QWindow *oldWindow, bool destroyed) = 0;
+ virtual void winIdChanged() = 0;
+ virtual bool windowAttributeChanged(const QString &key, const QVariant &attribute,
+ const QVariant &oldAttribute);
protected:
QObject *m_host{};
std::unique_ptr<WindowItemDelegate> m_delegate;
QWindow *m_windowHandle{};
- QPointer<QWindow> m_windowHandleGuard;
QSet<const QObject *> m_hitTestVisibleItems;
#ifdef Q_OS_MAC
@@ -74,7 +92,12 @@
#endif
QObject *m_titleBar{};
- std::array<QObject *, WindowAgentBase::NumSystemButton> m_systemButtons{};
+ std::array<QObject *, WindowAgentBase::Close + 1> m_systemButtons{};
+
+ QVariantHash m_windowAttributes;
+
+ std::unique_ptr<QObject> m_windowEventFilter;
+ std::unique_ptr<QObject> m_winIdChangeEventFilter;
};
inline QObject *AbstractWindowContext::host() const {
--
Gitblit v1.9.1