From 5078f898257a53295167f22c67005ad1b30d4bf8 Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: 周二, 12 12月 2023 02:53:57 +0800 Subject: [PATCH] Tested MinGW 13.2.0 --- src/core/contexts/abstractwindowcontext.cpp | 42 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 36 insertions(+), 6 deletions(-) diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp index e1187fa..d3e8c0f 100644 --- a/src/core/contexts/abstractwindowcontext.cpp +++ b/src/core/contexts/abstractwindowcontext.cpp @@ -1,10 +1,20 @@ #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) { - } + QWK_USED static constexpr const struct { + const quint32 activeLight = MAKE_RGBA_COLOR(210, 233, 189, 226); + const quint32 activeDark = MAKE_RGBA_COLOR(177, 205, 190, 240); + const quint32 inactiveLight = MAKE_RGBA_COLOR(193, 195, 211, 203); + const quint32 inactiveDark = MAKE_RGBA_COLOR(240, 240, 250, 255); + } kSampleColorSet; + + AbstractWindowContext::AbstractWindowContext() = default; AbstractWindowContext::~AbstractWindowContext() = default; @@ -24,7 +34,7 @@ if (!setupHost()) { m_host = nullptr; - m_delegate = nullptr; + m_delegate.reset(); m_windowHandle = nullptr; return false; } @@ -171,10 +181,30 @@ void AbstractWindowContext::virtual_hook(int id, void *data) { switch (id) { case NeedsDrawBordersHook: { - auto &result = *reinterpret_cast<bool *>(data); + auto &result = *static_cast<bool *>(data); result = false; - break; + return; } + + case BorderThicknessHook: { + auto args = static_cast<void **>(data); + const bool requireNative = *static_cast<const bool *>(args[0]); + quint32 &thickness = *static_cast<quint32 *>(args[1]); + std::ignore = requireNative; + thickness = 1; + return; + } + + case BorderColorsHook: { + auto arr = *reinterpret_cast<QList<QColor> *>(data); + arr.clear(); + arr.push_back(kSampleColorSet.activeLight); + arr.push_back(kSampleColorSet.activeDark); + arr.push_back(kSampleColorSet.inactiveLight); + arr.push_back(kSampleColorSet.inactiveDark); + return; + } + default: break; } -- Gitblit v1.9.1