From 1b9ac9ea6998ac8a4e51413e06aeed859e784b26 Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: 周一, 11 12月 2023 20:09:19 +0800 Subject: [PATCH] minor tweaks --- src/core/contexts/abstractwindowcontext.cpp | 73 +++++++++++++++++++++++++++++++++--- 1 files changed, 66 insertions(+), 7 deletions(-) diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp index 71431ff..fa8ee74 100644 --- a/src/core/contexts/abstractwindowcontext.cpp +++ b/src/core/contexts/abstractwindowcontext.cpp @@ -1,9 +1,13 @@ #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; @@ -61,7 +65,7 @@ } bool AbstractWindowContext::setSystemButton(WindowAgentBase::SystemButton button, - const QObject *obj) { + QObject *obj) { Q_ASSERT(obj); Q_ASSERT(button != WindowAgentBase::Unknown); if (!obj || (button == WindowAgentBase::Unknown)) { @@ -75,7 +79,7 @@ return true; } - bool AbstractWindowContext::setTitleBar(const QObject *item) { + bool AbstractWindowContext::setTitleBar(QObject *item) { Q_ASSERT(item); if (!item) { return false; @@ -88,7 +92,9 @@ return true; } - void AbstractWindowContext::showSystemMenu(const QPoint &pos){Q_UNUSED(pos)} + void AbstractWindowContext::showSystemMenu(const QPoint &pos) { + virtual_hook(ShowSystemMenuHook, &const_cast<QPoint &>(pos)); + } QRegion AbstractWindowContext::hitTestShape() const { if (hitTestVisibleShapeDirty) { @@ -162,8 +168,61 @@ return true; } - QObject *AbstractWindowContext::target() const { - return m_host; + 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