From a51b5688e1c33d3ce96b48c869603b00f908f513 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周三, 13 12月 2023 04:16:37 +0800
Subject: [PATCH] Make better code structure for border handlers
---
src/core/contexts/abstractwindowcontext_p.h | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index 28ff0de..2934b4d 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -9,12 +9,12 @@
#include <QtGui/QPolygon>
#include <QWKCore/windowagentbase.h>
-#include <QWKCore/sharedeventfilter.h>
+#include <QWKCore/private/eventobserver_p.h>
#include <QWKCore/private/windowitemdelegate_p.h>
namespace QWK {
- class QWK_CORE_EXPORT AbstractWindowContext : public QObject, public SharedEventDispatcher {
+ class QWK_CORE_EXPORT AbstractWindowContext : public QObject, public EventDispatcher {
Q_OBJECT
public:
AbstractWindowContext();
@@ -30,33 +30,41 @@
bool setHitTestVisible(const QObject *obj, bool visible);
bool setHitTestVisible(const QRect &rect, bool visible);
- inline const QObject *systemButton(WindowAgentBase::SystemButton button) const;
- bool setSystemButton(WindowAgentBase::SystemButton button, const QObject *obj);
+ inline QObject *systemButton(WindowAgentBase::SystemButton button) const;
+ bool setSystemButton(WindowAgentBase::SystemButton button, QObject *obj);
- inline const QObject *titleBar() const;
- bool setTitleBar(const QObject *obj);
-
- virtual void showSystemMenu(const QPoint &pos);
+ inline QObject *titleBar() const;
+ bool setTitleBar(QObject *obj);
QRegion hitTestShape() const;
bool isInSystemButtons(const QPoint &pos, WindowAgentBase::SystemButton *button) const;
bool isInTitleBarDraggableArea(const QPoint &pos) const;
+ virtual QString key() const;
+
+ enum WindowContextHook {
+ CentralizeHook = 1,
+ ShowSystemMenuHook,
+ 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;
- QObject *target() const override;
-
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;
- const QObject *m_titleBar{};
- std::array<const QObject *, WindowAgentBase::NumSystemButton> m_systemButtons{};
+ QObject *m_titleBar{};
+ std::array<QObject *, WindowAgentBase::NumSystemButton> m_systemButtons{};
// Cached shape
mutable bool hitTestVisibleShapeDirty{};
@@ -75,12 +83,12 @@
return m_hitTestVisibleItems.contains(obj);
}
- inline const QObject *
+ inline QObject *
AbstractWindowContext::systemButton(WindowAgentBase::SystemButton button) const {
return m_systemButtons[button];
}
- inline const QObject *AbstractWindowContext::titleBar() const {
+ inline QObject *AbstractWindowContext::titleBar() const {
return m_titleBar;
}
--
Gitblit v1.9.1