From 59207cbc449e2e69e6b794115f8aeae168dba405 Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周三, 13 12月 2023 20:08:19 +0800
Subject: [PATCH] minor tweaks
---
src/core/contexts/abstractwindowcontext.cpp | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index e1187fa..2a68081 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;
}
@@ -86,10 +96,6 @@
}
m_titleBar = item;
return true;
- }
-
- void AbstractWindowContext::showSystemMenu(const QPoint &pos) {
- virtual_hook(ShowSystemMenuHook, &const_cast<QPoint &>(pos));
}
QRegion AbstractWindowContext::hitTestShape() const {
@@ -170,14 +176,32 @@
void AbstractWindowContext::virtual_hook(int id, void *data) {
switch (id) {
- case NeedsDrawBordersHook: {
- auto &result = *reinterpret_cast<bool *>(data);
- result = false;
+ case CentralizeHook: {
+ // TODO: Qt
break;
+ }
+
+ case ShowSystemMenuHook: {
+ // TODO: Qt
+ break;
+ }
+
+ case DefaultColorsHook: {
+ auto &map = *static_cast<QMap<QString, QColor> *>(data);
+ map.clear();
+ map.insert(QStringLiteral("activeLight"), kSampleColorSet.activeLight);
+ map.insert(QStringLiteral("activeDark"), kSampleColorSet.activeDark);
+ map.insert(QStringLiteral("inactiveLight"), kSampleColorSet.inactiveLight);
+ map.insert(QStringLiteral("inactiveDark"), kSampleColorSet.inactiveDark);
+ return;
}
default:
break;
}
}
+ void AbstractWindowContext::showSystemMenu(const QPoint &pos) {
+ virtual_hook(ShowSystemMenuHook, &const_cast<QPoint &>(pos));
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1