From eda513356b8eb58b3069ddceb8c3dbc63c7fcdcd Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周日, 17 12月 2023 15:58:49 +0800
Subject: [PATCH] Update resources
---
src/core/contexts/abstractwindowcontext.cpp | 96 ++++++++++++++++-------------------------------
1 files changed, 33 insertions(+), 63 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 49eb0c5..7c40c89 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -7,8 +7,7 @@
namespace QWK {
- AbstractWindowContext::AbstractWindowContext() {
- }
+ AbstractWindowContext::AbstractWindowContext() = default;
AbstractWindowContext::~AbstractWindowContext() = default;
@@ -28,7 +27,7 @@
if (!setupHost()) {
m_host = nullptr;
- m_delegate = nullptr;
+ m_delegate.reset();
m_windowHandle = nullptr;
return false;
}
@@ -46,21 +45,6 @@
} else {
m_hitTestVisibleItems.remove(obj);
}
- return true;
- }
-
- bool AbstractWindowContext::setHitTestVisible(const QRect &rect, bool visible) {
- Q_ASSERT(rect.isValid());
- if (!rect.isValid()) {
- return false;
- }
-
- if (visible) {
- m_hitTestVisibleRects.append(rect);
- } else {
- m_hitTestVisibleRects.removeAll(rect);
- }
- hitTestVisibleShapeDirty = true;
return true;
}
@@ -92,20 +76,12 @@
return true;
}
- void AbstractWindowContext::showSystemMenu(const QPoint &pos) {
- virtual_hook(ShowSystemMenuHook, &const_cast<QPoint &>(pos));
+#ifdef Q_OS_MAC
+ void AbstractWindowContext::setSystemButtonArea(const QRect &rect) {
+ m_systemButtonArea = rect;
+ virtual_hook(SystemButtonAreaChangedHook, nullptr);
}
-
- QRegion AbstractWindowContext::hitTestShape() const {
- if (hitTestVisibleShapeDirty) {
- hitTestVisibleShape = {};
- for (const auto &rect : m_hitTestVisibleRects) {
- hitTestVisibleShape += rect;
- }
- hitTestVisibleShapeDirty = false;
- }
- return hitTestVisibleShape;
- }
+#endif
bool AbstractWindowContext::isInSystemButtons(const QPoint &pos,
WindowAgentBase::SystemButton *button) const {
@@ -162,9 +138,6 @@
}
}
- if (!m_hitTestVisibleRects.isEmpty() && hitTestShape().contains(pos)) {
- return false;
- }
return true;
}
@@ -172,45 +145,42 @@
return {};
}
- static constexpr struct {
- const quint32 grass = 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(240, 240, 250, 255);
+ 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;
void AbstractWindowContext::virtual_hook(int id, void *data) {
switch (id) {
- case NeedsDrawBordersHook: {
- auto &result = *static_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;
}
- case DrawBordersHook: {
- auto args = static_cast<void **>(data);
- auto &painter = *static_cast<QPainter *>(args[0]);
- const auto &rect = *static_cast<const QRect *>(args[1]);
- // Top
- painter.setPen(kSampleColorSet.grass);
- painter.drawLine(rect.topLeft(), rect.topRight());
-
- // Right
- painter.setPen(kSampleColorSet.pink);
- painter.drawLine(rect.topRight(), rect.bottomRight());
-
- // Bottom
- painter.setPen(kSampleColorSet.tile);
- painter.drawLine(rect.bottomLeft(), rect.bottomRight());
-
- // Right
- painter.setPen(kSampleColorSet.azure);
- painter.drawLine(rect.topLeft(), rect.bottomLeft());
- 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