From d3d7430ec9afb94abaf78fa2c9edd9d9f946881c Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周一, 18 12月 2023 01:29:07 +0800
Subject: [PATCH] Add QtContext WinIdChange workaround
---
src/core/contexts/abstractwindowcontext.cpp | 167 +++++++++++++++++++++++++------------------------------
1 files changed, 76 insertions(+), 91 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index c7a5c85..ef1efbf 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -1,60 +1,26 @@
#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;
- class EventFilterForwarder : public QObject {
- public:
- using EventProc = bool (*)(QEvent *, void *);
-
- EventFilterForwarder(EventProc proc, void *user, QObject *parent = nullptr)
- : QObject(parent), proc(proc), user(user) {
+ void AbstractWindowContext::setup(QObject *host, WindowItemDelegate *delegate) {
+ if (m_host || !host || !delegate) {
+ return;
}
-
- bool eventFilter(QObject *obj, QEvent *event) override {
- Q_UNUSED(obj)
- return proc(event, user);
- }
-
- protected:
- EventProc proc;
- void *user;
- };
-
- bool AbstractWindowContext::setup(QObject *host, WindowItemDelegate *delegate) {
- if (!host || !delegate) {
- return false;
- }
-
- 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 = nullptr;
- m_windowHandle = nullptr;
- return false;
+ m_windowHandle = m_delegate->hostWindow(m_host);
+ if (m_windowHandle) {
+ winIdChanged(nullptr);
}
-
- // Install specific event filter
- host->installEventFilter(new EventFilterForwarder(
- [](QEvent *event, void *user) {
- return reinterpret_cast<AbstractWindowContext *>(user)->hostEventFilter(event);
- },
- this, this));
-
- return true;
}
bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
@@ -71,26 +37,11 @@
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(CoreWindowAgent::SystemButton button,
- const QObject *obj) {
+ bool AbstractWindowContext::setSystemButton(WindowAgentBase::SystemButton button,
+ QObject *obj) {
Q_ASSERT(obj);
- Q_ASSERT(button != CoreWindowAgent::Unknown);
- if (!obj || (button == CoreWindowAgent::Unknown)) {
+ Q_ASSERT(button != WindowAgentBase::Unknown);
+ if (!obj || (button == WindowAgentBase::Unknown)) {
return false;
}
@@ -101,7 +52,7 @@
return true;
}
- bool AbstractWindowContext::setTitleBar(const QObject *item) {
+ bool AbstractWindowContext::setTitleBar(QObject *item) {
Q_ASSERT(item);
if (!item) {
return false;
@@ -114,32 +65,24 @@
return true;
}
- void AbstractWindowContext::showSystemMenu(const 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,
- CoreWindowAgent::SystemButton *button) const {
- *button = CoreWindowAgent::Unknown;
- for (int i = CoreWindowAgent::WindowIcon; i <= CoreWindowAgent::Close; ++i) {
+ WindowAgentBase::SystemButton *button) const {
+ *button = WindowAgentBase::Unknown;
+ for (int i = WindowAgentBase::WindowIcon; i <= WindowAgentBase::Close; ++i) {
auto currentButton = m_systemButtons[i];
if (!currentButton || !m_delegate->isVisible(currentButton) ||
!m_delegate->isEnabled(currentButton)) {
continue;
}
if (m_delegate->mapGeometryToScene(currentButton).contains(pos)) {
- *button = static_cast<CoreWindowAgent::SystemButton>(i);
+ *button = static_cast<WindowAgentBase::SystemButton>(i);
return true;
}
}
@@ -168,7 +111,7 @@
return false;
}
- for (int i = CoreWindowAgent::WindowIcon; i <= CoreWindowAgent::Close; ++i) {
+ for (int i = WindowAgentBase::WindowIcon; i <= WindowAgentBase::Close; ++i) {
auto currentButton = m_systemButtons[i];
if (currentButton && m_delegate->isVisible(currentButton) &&
m_delegate->isEnabled(currentButton) &&
@@ -184,15 +127,57 @@
}
}
- if (!m_hitTestVisibleRects.isEmpty() && hitTestShape().contains(pos)) {
- return false;
- }
return true;
}
- bool AbstractWindowContext::hostEventFilter(QEvent *event) {
- Q_UNUSED(event)
- return false;
+ QString AbstractWindowContext::key() const {
+ return {};
}
-}
\ No newline at end of file
+ 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));
+ }
+
+ 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