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 | 59 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index a92d91d..2934b4d 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -8,64 +8,83 @@
#include <QtGui/QWindow>
#include <QtGui/QPolygon>
-#include <QWKCore/corewindowagent.h>
-#include <QWKCore/windowitemdelegate.h>
+#include <QWKCore/windowagentbase.h>
+#include <QWKCore/private/eventobserver_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 EventDispatcher {
Q_OBJECT
public:
- AbstractWindowContext(QWindow *window, WindowItemDelegate *delegate);
+ AbstractWindowContext();
~AbstractWindowContext() override;
public:
- virtual bool setup() = 0;
+ bool setup(QObject *host, WindowItemDelegate *delegate);
+ inline QObject *host() const;
inline QWindow *window() const;
- void setupWindow(QWindow *window);
- inline bool isHitTestVisible(QObject *obj) const;
- bool setHitTestVisible(QObject *obj, bool visible);
+ inline bool isHitTestVisible(const QObject *obj) const;
+ bool setHitTestVisible(const QObject *obj, bool visible);
bool setHitTestVisible(const QRect &rect, bool visible);
- inline QObject *systemButton(CoreWindowAgent::SystemButton button) const;
- bool setSystemButton(CoreWindowAgent::SystemButton button, QObject *obj);
+ inline QObject *systemButton(WindowAgentBase::SystemButton button) const;
+ bool setSystemButton(WindowAgentBase::SystemButton button, QObject *obj);
inline QObject *titleBar() const;
bool setTitleBar(QObject *obj);
- void showSystemMenu(const QPoint &pos);
-
QRegion hitTestShape() const;
- bool isInSystemButtons(const QPoint &pos, CoreWindowAgent::SystemButton *button) const;
+ bool isInSystemButtons(const QPoint &pos, WindowAgentBase::SystemButton *button) const;
bool isInTitleBarDraggableArea(const QPoint &pos) const;
- protected:
- QWindow *m_windowHandle;
- std::unique_ptr<WindowItemDelegate> m_delegate;
+ virtual QString key() const;
- QSet<QObject *> m_hitTestVisibleItems;
+ 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;
+
+ protected:
+ QObject *m_host{};
+ std::unique_ptr<WindowItemDelegate> m_delegate;
+ QWindow *m_windowHandle{};
+
+ QSet<const QObject *> m_hitTestVisibleItems;
QList<QRect> m_hitTestVisibleRects;
QObject *m_titleBar{};
- std::array<QObject *, CoreWindowAgent::NumSystemButton> m_systemButtons{};
+ std::array<QObject *, WindowAgentBase::NumSystemButton> m_systemButtons{};
// Cached shape
mutable bool hitTestVisibleShapeDirty{};
mutable QRegion hitTestVisibleShape;
};
+ inline QObject *AbstractWindowContext::host() const {
+ return m_host;
+ }
+
inline QWindow *AbstractWindowContext::window() const {
return m_windowHandle;
}
- inline bool AbstractWindowContext::isHitTestVisible(QObject *obj) const {
+ inline bool AbstractWindowContext::isHitTestVisible(const QObject *obj) const {
return m_hitTestVisibleItems.contains(obj);
}
inline QObject *
- AbstractWindowContext::systemButton(CoreWindowAgent::SystemButton button) const {
+ AbstractWindowContext::systemButton(WindowAgentBase::SystemButton button) const {
return m_systemButtons[button];
}
--
Gitblit v1.9.1