From 2df00b7e7bf5fd9c2f171449f71d1b101480f0db Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周一, 11 12月 2023 20:24:24 +0800
Subject: [PATCH] finish border paint code
---
src/core/contexts/abstractwindowcontext.cpp | 114 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 72 insertions(+), 42 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index c7a5c85..fa8ee74 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -1,30 +1,16 @@
#include "abstractwindowcontext_p.h"
+#include <QtGui/QPen>
+#include <QtGui/QPainter>
+
+#include "qwkglobal_p.h"
+
namespace QWK {
- AbstractWindowContext::AbstractWindowContext()
- : m_host(nullptr), m_delegate(nullptr), m_windowHandle(nullptr) {
+ AbstractWindowContext::AbstractWindowContext() {
}
AbstractWindowContext::~AbstractWindowContext() = default;
-
- class EventFilterForwarder : public QObject {
- public:
- using EventProc = bool (*)(QEvent *, void *);
-
- EventFilterForwarder(EventProc proc, void *user, QObject *parent = nullptr)
- : QObject(parent), proc(proc), user(user) {
- }
-
- bool eventFilter(QObject *obj, QEvent *event) override {
- Q_UNUSED(obj)
- return proc(event, user);
- }
-
- protected:
- EventProc proc;
- void *user;
- };
bool AbstractWindowContext::setup(QObject *host, WindowItemDelegate *delegate) {
if (!host || !delegate) {
@@ -46,14 +32,6 @@
m_windowHandle = nullptr;
return false;
}
-
- // Install specific event filter
- host->installEventFilter(new EventFilterForwarder(
- [](QEvent *event, void *user) {
- return reinterpret_cast<AbstractWindowContext *>(user)->hostEventFilter(event);
- },
- this, this));
-
return true;
}
@@ -86,11 +64,11 @@
return true;
}
- bool AbstractWindowContext::setSystemButton(CoreWindowAgent::SystemButton button,
- const QObject *obj) {
+ bool AbstractWindowContext::setSystemButton(WindowAgentBase::SystemButton button,
+ QObject *obj) {
Q_ASSERT(obj);
- Q_ASSERT(button != CoreWindowAgent::Unknown);
- if (!obj || (button == CoreWindowAgent::Unknown)) {
+ Q_ASSERT(button != WindowAgentBase::Unknown);
+ if (!obj || (button == WindowAgentBase::Unknown)) {
return false;
}
@@ -101,7 +79,7 @@
return true;
}
- bool AbstractWindowContext::setTitleBar(const QObject *item) {
+ bool AbstractWindowContext::setTitleBar(QObject *item) {
Q_ASSERT(item);
if (!item) {
return false;
@@ -115,7 +93,7 @@
}
void AbstractWindowContext::showSystemMenu(const QPoint &pos) {
- // ?
+ virtual_hook(ShowSystemMenuHook, &const_cast<QPoint &>(pos));
}
QRegion AbstractWindowContext::hitTestShape() const {
@@ -130,16 +108,16 @@
}
bool AbstractWindowContext::isInSystemButtons(const QPoint &pos,
- CoreWindowAgent::SystemButton *button) const {
- *button = CoreWindowAgent::Unknown;
- for (int i = CoreWindowAgent::WindowIcon; i <= CoreWindowAgent::Close; ++i) {
+ WindowAgentBase::SystemButton *button) const {
+ *button = WindowAgentBase::Unknown;
+ for (int i = WindowAgentBase::WindowIcon; i <= WindowAgentBase::Close; ++i) {
auto currentButton = m_systemButtons[i];
if (!currentButton || !m_delegate->isVisible(currentButton) ||
!m_delegate->isEnabled(currentButton)) {
continue;
}
if (m_delegate->mapGeometryToScene(currentButton).contains(pos)) {
- *button = static_cast<CoreWindowAgent::SystemButton>(i);
+ *button = static_cast<WindowAgentBase::SystemButton>(i);
return true;
}
}
@@ -168,7 +146,7 @@
return false;
}
- for (int i = CoreWindowAgent::WindowIcon; i <= CoreWindowAgent::Close; ++i) {
+ for (int i = WindowAgentBase::WindowIcon; i <= WindowAgentBase::Close; ++i) {
auto currentButton = m_systemButtons[i];
if (currentButton && m_delegate->isVisible(currentButton) &&
m_delegate->isEnabled(currentButton) &&
@@ -190,9 +168,61 @@
return true;
}
- bool AbstractWindowContext::hostEventFilter(QEvent *event) {
- Q_UNUSED(event)
- return false;
+ QString AbstractWindowContext::key() const {
+ return {};
+ }
+
+ static constexpr struct {
+ const quint32 lilac = MAKE_RGBA_COLOR(210, 233, 189, 226);
+ const quint32 pink = MAKE_RGBA_COLOR(177, 205, 190, 240);
+ const quint32 tile = MAKE_RGBA_COLOR(193, 195, 211, 203);
+ const quint32 azure = MAKE_RGBA_COLOR(25, 90, 190, 255);
+ } kSampleColorSet;
+
+ void AbstractWindowContext::virtual_hook(int id, void *data) {
+ switch (id) {
+ case ShowSystemMenuHook: {
+ const auto &pos = *reinterpret_cast<const QPoint *>(data);
+ // ...
+ return;
+ }
+ case NeedsDrawBordersHook: {
+ auto &result = *reinterpret_cast<bool *>(data);
+ result = false;
+ break;
+ }
+ case DrawBordersHook: {
+ auto args = reinterpret_cast<void **>(data);
+ auto &painter = *reinterpret_cast<QPainter *>(args[0]);
+ auto &rect = *reinterpret_cast<const QRect *>(args[1]);
+
+ QPen pen;
+ pen.setWidth(1);
+
+ // Top
+ pen.setColor(kSampleColorSet.lilac);
+ painter.setPen(pen);
+ painter.drawLine(rect.topLeft(), rect.topRight());
+
+ // Right
+ pen.setColor(kSampleColorSet.pink);
+ painter.setPen(pen);
+ painter.drawLine(rect.topRight(), rect.bottomRight());
+
+ // Bottom
+ pen.setColor(kSampleColorSet.tile);
+ painter.setPen(pen);
+ painter.drawLine(rect.bottomLeft(), rect.bottomRight());
+
+ // Right
+ pen.setColor(kSampleColorSet.azure);
+ painter.setPen(pen);
+ painter.drawLine(rect.topLeft(), rect.bottomLeft());
+ return;
+ }
+ default:
+ break;
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1