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 | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h index f8ea17e..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; - bool setWindowAttribute(const QString &key, const QVariant &attribute); - 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; @@ -73,6 +76,9 @@ 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() = 0; virtual bool windowAttributeChanged(const QString &key, const QVariant &attribute, @@ -85,7 +91,7 @@ QSet<const QObject *> m_hitTestVisibleItems; #ifdef Q_OS_MAC - QRect m_systemButtonArea; + ScreenRectCallback m_systemButtonAreaCallback; #endif QObject *m_titleBar{}; @@ -93,6 +99,7 @@ QVariantHash m_windowAttributes; + std::unique_ptr<QObject> m_windowEventFilter; std::unique_ptr<QObject> m_winIdChangeEventFilter; }; @@ -106,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 { @@ -126,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