From 0586c98f90866e4bc9f0dfe73aefb0a07c56697e Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: 周二, 12 12月 2023 15:44:14 +0800 Subject: [PATCH] Add win10 border handler --- src/core/contexts/abstractwindowcontext.cpp | 41 ++++++++++++++++++++++++++++++++++------- 1 files changed, 34 insertions(+), 7 deletions(-) diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp index d60a6c7..3c902e9 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; } @@ -61,7 +71,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 +85,7 @@ return true; } - bool AbstractWindowContext::setTitleBar(const QObject *item) { + bool AbstractWindowContext::setTitleBar(QObject *item) { Q_ASSERT(item); if (!item) { return false; @@ -170,8 +180,25 @@ void AbstractWindowContext::virtual_hook(int id, void *data) { switch (id) { - case CentralizeHook: + case CentralizeHook: { + // TODO: Qt break; + } + + case ShowSystemMenuHook: { + // TODO: Qt + break; + } + + case DefaultColorsHook: { + auto map = *reinterpret_cast<QMap<QString, QColor> *>(data); + map.clear(); + map.insert("activeLight", kSampleColorSet.activeLight); + map.insert("activeDark", kSampleColorSet.activeDark); + map.insert("inactiveLight", kSampleColorSet.inactiveLight); + map.insert("inactiveDark", kSampleColorSet.inactiveDark); + return; + } default: break; } -- Gitblit v1.9.1