From 1fab480dc53e910a614d5d836993adb743d59352 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周六, 16 12月 2023 20:52:30 +0800
Subject: [PATCH] Remove redundant API
---
src/core/contexts/abstractwindowcontext.cpp | 88 ++++++++++++++++++++++++-------------------
1 files changed, 49 insertions(+), 39 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 71431ff..96f2935 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -1,10 +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() = default;
AbstractWindowContext::~AbstractWindowContext() = default;
@@ -24,7 +27,7 @@
if (!setupHost()) {
m_host = nullptr;
- m_delegate = nullptr;
+ m_delegate.reset();
m_windowHandle = nullptr;
return false;
}
@@ -45,23 +48,8 @@
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;
- }
-
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 +63,7 @@
return true;
}
- bool AbstractWindowContext::setTitleBar(const QObject *item) {
+ bool AbstractWindowContext::setTitleBar(QObject *item) {
Q_ASSERT(item);
if (!item) {
return false;
@@ -86,19 +74,6 @@
}
m_titleBar = item;
return true;
- }
-
- void AbstractWindowContext::showSystemMenu(const QPoint &pos){Q_UNUSED(pos)}
-
- QRegion AbstractWindowContext::hitTestShape() const {
- if (hitTestVisibleShapeDirty) {
- hitTestVisibleShape = {};
- for (const auto &rect : m_hitTestVisibleRects) {
- hitTestVisibleShape += rect;
- }
- hitTestVisibleShapeDirty = false;
- }
- return hitTestVisibleShape;
}
bool AbstractWindowContext::isInSystemButtons(const QPoint &pos,
@@ -156,14 +131,49 @@
}
}
- if (!m_hitTestVisibleRects.isEmpty() && hitTestShape().contains(pos)) {
- return false;
- }
return true;
}
- QObject *AbstractWindowContext::target() const {
- return m_host;
+ QString AbstractWindowContext::key() const {
+ return {};
+ }
+
+ 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 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