From 187f82bb4065589fa7fba5f6fa9bd51113357a2c Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周一, 18 12月 2023 14:29:35 +0800
Subject: [PATCH] minor tweaks
---
src/core/contexts/abstractwindowcontext.cpp | 98 ++++++++++++++++++------------------------------
1 files changed, 37 insertions(+), 61 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 3c902e9..ef1efbf 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -7,38 +7,20 @@
namespace QWK {
- 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;
- bool AbstractWindowContext::setup(QObject *host, WindowItemDelegate *delegate) {
- if (!host || !delegate) {
- return false;
+ void AbstractWindowContext::setup(QObject *host, WindowItemDelegate *delegate) {
+ if (m_host || !host || !delegate) {
+ return;
}
-
- auto windowHandle = delegate->hostWindow(host);
- if (!windowHandle) {
- return false;
- }
-
m_host = host;
m_delegate.reset(delegate);
- m_windowHandle = windowHandle;
-
- if (!setupHost()) {
- m_host = nullptr;
- m_delegate.reset();
- m_windowHandle = nullptr;
- return false;
+ m_windowHandle = m_delegate->hostWindow(m_host);
+ if (m_windowHandle) {
+ winIdChanged(nullptr);
}
- return true;
}
bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
@@ -52,21 +34,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;
}
@@ -98,20 +65,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 {
@@ -168,15 +127,19 @@
}
}
- if (!m_hitTestVisibleRects.isEmpty() && hitTestShape().contains(pos)) {
- return false;
- }
return true;
}
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) {
@@ -191,17 +154,30 @@
}
case DefaultColorsHook: {
- auto map = *reinterpret_cast<QMap<QString, QColor> *>(data);
+ auto &map = *static_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);
+ 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;
}
}
-}
\ No newline at end of file
+ void AbstractWindowContext::showSystemMenu(const QPoint &pos) {
+ virtual_hook(ShowSystemMenuHook, &const_cast<QPoint &>(pos));
+ }
+
+ void AbstractWindowContext::notifyWinIdChange() {
+ auto oldWindow = m_windowHandle;
+ m_windowHandle = m_delegate->window(m_host);
+ if (oldWindow == m_windowHandle)
+ return;
+ winIdChanged(oldWindow);
+ }
+
+}
--
Gitblit v1.9.1