From 564f33e8b29a6f73050f4da3f843b942aaf0d739 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周三, 08 5月 2024 19:36:16 +0800
Subject: [PATCH] Improve event filter handling
---
src/core/contexts/abstractwindowcontext.cpp | 233 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 149 insertions(+), 84 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 49eb0c5..71818c2 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -1,38 +1,29 @@
+// Copyright (C) 2023-2024 Stdware Collections (https://www.github.com/stdware)
+// Copyright (C) 2021-2023 wangwenx190 (Yuhang Zhao)
+// SPDX-License-Identifier: Apache-2.0
+
#include "abstractwindowcontext_p.h"
#include <QtGui/QPen>
#include <QtGui/QPainter>
+#include <QtGui/QScreen>
#include "qwkglobal_p.h"
namespace QWK {
- AbstractWindowContext::AbstractWindowContext() {
- }
+ 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 = nullptr;
- m_windowHandle = nullptr;
- return false;
- }
- return true;
+ m_winIdChangeEventFilter.reset(delegate->createWinIdEventFilter(host, this));
+ notifyWinIdChange();
}
bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
@@ -49,26 +40,10 @@
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,
QObject *obj) {
- Q_ASSERT(obj);
Q_ASSERT(button != WindowAgentBase::Unknown);
- if (!obj || (button == WindowAgentBase::Unknown)) {
+ if (button == WindowAgentBase::Unknown) {
return false;
}
@@ -81,31 +56,28 @@
bool AbstractWindowContext::setTitleBar(QObject *item) {
Q_ASSERT(item);
- if (!item) {
- return false;
- }
-
if (m_titleBar == item) {
return false;
}
+
+ if (m_titleBar) {
+ // Since the title bar is changed, all items inside it should be dereferenced right away
+ for (auto &button : m_systemButtons) {
+ button = nullptr;
+ }
+ m_hitTestVisibleItems.clear();
+ }
+
m_titleBar = item;
return true;
}
- void AbstractWindowContext::showSystemMenu(const QPoint &pos) {
- virtual_hook(ShowSystemMenuHook, &const_cast<QPoint &>(pos));
+#ifdef Q_OS_MAC
+ void AbstractWindowContext::setSystemButtonAreaCallback(const ScreenRectCallback &callback) {
+ m_systemButtonAreaCallback = callback;
+ 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 +134,6 @@
}
}
- if (!m_hitTestVisibleRects.isEmpty() && hitTestShape().contains(pos)) {
- return false;
- }
return true;
}
@@ -172,45 +141,141 @@
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: {
+ if (!m_windowId)
+ return;
+
+ QRect windowGeometry = m_delegate->getGeometry(m_host);
+ QRect screenGeometry = m_windowHandle->screen()->geometry();
+ int x = (screenGeometry.width() - windowGeometry.width()) / 2;
+ int y = (screenGeometry.height() - windowGeometry.height()) / 2;
+ QPoint pos(x, y);
+ pos += screenGeometry.topLeft();
+ m_delegate->setGeometry(m_host, QRect(pos, windowGeometry.size()));
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());
+ case RaiseWindowHook: {
+ if (!m_windowId)
+ return;
- // 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());
+ m_delegate->setWindowVisible(m_host, true);
+ Qt::WindowStates state = m_delegate->getWindowState(m_host);
+ if (state & Qt::WindowMinimized) {
+ m_delegate->setWindowState(m_host, state & ~Qt::WindowMinimized);
+ }
+ m_delegate->bringWindowToTop(m_host);
return;
}
+
+ 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;
}
}
-}
\ No newline at end of file
+ void AbstractWindowContext::showSystemMenu(const QPoint &pos) {
+ virtual_hook(ShowSystemMenuHook, &const_cast<QPoint &>(pos));
+ }
+
+ void AbstractWindowContext::notifyWinIdChange() {
+ auto oldWinId = m_windowId;
+ m_windowId = m_winIdChangeEventFilter->winId();
+
+ // In Qt6, after QWidget::close() is called, the related QWindow's all surfaces and the
+ // platform window will be removed, and the WinId will be set to 0. After that, when the
+ // QWidget is shown again, the whole things will be recreated again.
+ // As a result, we must update our WindowContext each time the WinId changes.
+ if (m_windowHandle) {
+ removeEventFilter(m_windowHandle);
+ }
+ m_windowHandle = m_delegate->hostWindow(m_host);
+
+ if (oldWinId != m_windowId) {
+ winIdChanged(m_windowId, oldWinId);
+ }
+
+ if (m_windowHandle) {
+ m_windowHandle->installEventFilter(this);
+
+ // Refresh window attributes
+ auto attributes = m_windowAttributes;
+ m_windowAttributes.clear();
+ for (auto it = attributes.begin(); it != attributes.end(); ++it) {
+ if (!windowAttributeChanged(it.key(), it.value(), {})) {
+ continue;
+ }
+ m_windowAttributes.insert(it.key(), it.value());
+ }
+ }
+
+ // Send to shared dispatchers
+ if (oldWinId != m_windowId) {
+ QEvent e(QEvent::WinIdChange);
+ sharedDispatch(m_host, &e);
+ }
+ }
+
+ QVariant AbstractWindowContext::windowAttribute(const QString &key) const {
+ return m_windowAttributes.value(key);
+ }
+
+ bool AbstractWindowContext::setWindowAttribute(const QString &key, const QVariant &attribute) {
+ auto it = m_windowAttributes.find(key);
+ if (it == m_windowAttributes.end()) {
+ if (!attribute.isValid()) {
+ return true;
+ }
+ if (!m_windowHandle || !windowAttributeChanged(key, attribute, {})) {
+ return false;
+ }
+ m_windowAttributes.insert(key, attribute);
+ return true;
+ }
+
+ if (it.value() == attribute)
+ return true;
+ if (!m_windowHandle || !windowAttributeChanged(key, attribute, it.value())) {
+ return false;
+ }
+
+ if (attribute.isValid()) {
+ it.value() = attribute;
+ } else {
+ m_windowAttributes.erase(it);
+ }
+ return true;
+ }
+
+ bool AbstractWindowContext::eventFilter(QObject *obj, QEvent *event) {
+ if (obj == m_windowHandle && sharedDispatch(obj, event)) {
+ return true;
+ }
+ return QObject::eventFilter(obj, event);
+ }
+
+ bool AbstractWindowContext::windowAttributeChanged(const QString &key,
+ const QVariant &attribute,
+ const QVariant &oldAttribute) {
+ return false;
+ }
+
+}
--
Gitblit v1.9.1