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 | 123 ++++++++++++++++++++++++++++++++++------
1 files changed, 103 insertions(+), 20 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index a3d2bba..fa8ee74 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -1,18 +1,41 @@
#include "abstractwindowcontext_p.h"
+#include <QtGui/QPen>
+#include <QtGui/QPainter>
+
+#include "qwkglobal_p.h"
+
namespace QWK {
+
+ AbstractWindowContext::AbstractWindowContext() {
+ }
AbstractWindowContext::~AbstractWindowContext() = default;
- void AbstractWindowContext::setupWindow(QWindow *window) {
- Q_ASSERT(window);
- if (!window) {
- return;
+ bool AbstractWindowContext::setup(QObject *host, WindowItemDelegate *delegate) {
+ if (!host || !delegate) {
+ return false;
}
- m_windowHandle = window;
+
+ auto windowHandle = delegate->hostWindow(host);
+ if (!windowHandle) {
+ return false;
+ }
+
+ m_host = host;
+ m_delegate.reset(delegate);
+ m_windowHandle = windowHandle;
+
+ if (!setupHost()) {
+ m_host = nullptr;
+ m_delegate = nullptr;
+ m_windowHandle = nullptr;
+ return false;
+ }
+ return true;
}
- bool AbstractWindowContext::setHitTestVisible(QObject *obj, bool visible) {
+ bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
Q_ASSERT(obj);
if (!obj) {
return false;
@@ -41,11 +64,11 @@
return true;
}
- bool AbstractWindowContext::setSystemButton(CoreWindowAgent::SystemButton button,
+ 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;
}
@@ -70,7 +93,7 @@
}
void AbstractWindowContext::showSystemMenu(const QPoint &pos) {
- // ?
+ virtual_hook(ShowSystemMenuHook, &const_cast<QPoint &>(pos));
}
QRegion AbstractWindowContext::hitTestShape() const {
@@ -85,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 = CoreWindowAgent::WindowIcon;
+ *button = static_cast<WindowAgentBase::SystemButton>(i);
return true;
}
}
@@ -119,27 +142,87 @@
return false;
}
- for (int i = CoreWindowAgent::WindowIcon; i <= CoreWindowAgent::Close; ++i) {
+ if (!titleBarRect.contains(pos)) {
+ return false;
+ }
+
+ for (int i = WindowAgentBase::WindowIcon; i <= WindowAgentBase::Close; ++i) {
auto currentButton = m_systemButtons[i];
if (currentButton && m_delegate->isVisible(currentButton) &&
m_delegate->isEnabled(currentButton) &&
m_delegate->mapGeometryToScene(currentButton).contains(pos)) {
- return true;
+ return false;
}
}
for (auto widget : m_hitTestVisibleItems) {
if (widget && m_delegate->isVisible(widget) && m_delegate->isEnabled(widget) &&
m_delegate->mapGeometryToScene(widget).contains(pos)) {
- return true;
+ return false;
}
}
- if (hitTestShape().contains(pos)) {
- return true;
+ if (!m_hitTestVisibleRects.isEmpty() && hitTestShape().contains(pos)) {
+ return false;
}
+ return true;
+ }
- 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