From 44c08f3cc456155b960ca5a115df93109d2202ce Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: 周三, 13 12月 2023 23:22:25 +0800 Subject: [PATCH] Remove event observer --- src/core/contexts/abstractwindowcontext_p.h | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h index a7b6767..bcc6ae8 100644 --- a/src/core/contexts/abstractwindowcontext_p.h +++ b/src/core/contexts/abstractwindowcontext_p.h @@ -5,15 +5,16 @@ #include <memory> #include <QtCore/QSet> +#include <QtGui/QRegion> #include <QtGui/QWindow> -#include <QtGui/QPolygon> #include <QWKCore/windowagentbase.h> +#include <QWKCore/private/nativeeventfilter_p.h> #include <QWKCore/private/windowitemdelegate_p.h> namespace QWK { - class QWK_CORE_EXPORT AbstractWindowContext : public QObject { + class QWK_CORE_EXPORT AbstractWindowContext : public QObject, public NativeEventDispatcher { Q_OBJECT public: AbstractWindowContext(); @@ -35,8 +36,6 @@ inline QObject *titleBar() const; bool setTitleBar(QObject *obj); - void showSystemMenu(const QPoint &pos); - QRegion hitTestShape() const; bool isInSystemButtons(const QPoint &pos, WindowAgentBase::SystemButton *button) const; bool isInTitleBarDraggableArea(const QPoint &pos) const; @@ -46,18 +45,20 @@ enum WindowContextHook { CentralizeHook = 1, ShowSystemMenuHook, - NeedsDrawBordersHook, - DrawBordersHook, + DefaultColorsHook, + DrawWindows10BorderHook, // Only works on Windows 10 }; virtual void virtual_hook(int id, void *data); + + void showSystemMenu(const QPoint &pos); protected: virtual bool setupHost() = 0; protected: - QObject *m_host; + QObject *m_host{}; std::unique_ptr<WindowItemDelegate> m_delegate; - QWindow *m_windowHandle; + QWindow *m_windowHandle{}; QSet<const QObject *> m_hitTestVisibleItems; QList<QRect> m_hitTestVisibleRects; -- Gitblit v1.9.1