From b54e368f16e8bd977fe57fcc738fc6804af076e4 Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周一, 01 1月 2024 22:20:17 +0800
Subject: [PATCH] Update README
---
src/core/contexts/abstractwindowcontext_p.h | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index ecd2323..13490f3 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -1,3 +1,6 @@
+// Copyright (C) 2023-2024 Stdware Collections
+// SPDX-License-Identifier: Apache-2.0
+
#ifndef ABSTRACTWINDOWCONTEXT_P_H
#define ABSTRACTWINDOWCONTEXT_P_H
@@ -20,11 +23,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();
@@ -37,9 +43,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);
@@ -50,8 +53,8 @@
bool setTitleBar(QObject *obj);
#ifdef Q_OS_MAC
- inline QRect systemButtonArea() const;
- void setSystemButtonArea(const QRect &rect);
+ inline ScreenRectCallback systemButtonAreaCallback() const;
+ void setSystemButtonAreaCallback(const ScreenRectCallback &callback);
#endif
bool isInSystemButtons(const QPoint &pos, WindowAgentBase::SystemButton *button) const;
@@ -64,8 +67,8 @@
RaiseWindowHook,
ShowSystemMenuHook,
DefaultColorsHook,
- WindowAttributeChangedHook,
- 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);
@@ -73,8 +76,13 @@
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) = 0;
+ virtual void winIdChanged() = 0;
+ virtual bool windowAttributeChanged(const QString &key, const QVariant &attribute,
+ const QVariant &oldAttribute);
protected:
QObject *m_host{};
@@ -83,13 +91,16 @@
QSet<const QObject *> m_hitTestVisibleItems;
#ifdef Q_OS_MAC
- QRect m_systemButtonArea;
+ ScreenRectCallback m_systemButtonAreaCallback;
#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 {
@@ -102,10 +113,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 {
@@ -122,8 +129,8 @@
}
#ifdef Q_OS_MAC
- inline QRect AbstractWindowContext::systemButtonArea() const {
- return m_systemButtonArea;
+ inline ScreenRectCallback AbstractWindowContext::systemButtonAreaCallback() const {
+ return m_systemButtonAreaCallback;
}
#endif
--
Gitblit v1.9.1