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 | 151 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 102 insertions(+), 49 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 535ffc2..71818c2 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -1,3 +1,7 @@
+// 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>
@@ -18,22 +22,8 @@
}
m_host = host;
m_delegate.reset(delegate);
- setEnabled(true);
- }
-
- void AbstractWindowContext::setWindowAttribute(const QString &key, const QVariant &var) {
- auto it = m_windowAttributes.find(key);
- if (it.value() == var)
- return;
-
- auto newVar = var;
- auto oldVar = it.value();
- void *args[] = {
- &const_cast<QString &>(key),
- &newVar,
- &oldVar,
- };
- virtual_hook(WindowAttributeChangedHook, args);
+ m_winIdChangeEventFilter.reset(delegate->createWinIdEventFilter(host, this));
+ notifyWinIdChange();
}
bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
@@ -69,13 +59,22 @@
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;
}
#ifdef Q_OS_MAC
- void AbstractWindowContext::setSystemButtonArea(const QRect &rect) {
- m_systemButtonArea = rect;
+ void AbstractWindowContext::setSystemButtonAreaCallback(const ScreenRectCallback &callback) {
+ m_systemButtonAreaCallback = callback;
virtual_hook(SystemButtonAreaChangedHook, nullptr);
}
#endif
@@ -152,16 +151,24 @@
void AbstractWindowContext::virtual_hook(int id, void *data) {
switch (id) {
case CentralizeHook: {
+ if (!m_windowId)
+ return;
+
+ QRect windowGeometry = m_delegate->getGeometry(m_host);
QRect screenGeometry = m_windowHandle->screen()->geometry();
- int x = (screenGeometry.width() - m_windowHandle->width()) / 2;
- int y = (screenGeometry.height() - m_windowHandle->height()) / 2;
+ int x = (screenGeometry.width() - windowGeometry.width()) / 2;
+ int y = (screenGeometry.height() - windowGeometry.height()) / 2;
QPoint pos(x, y);
pos += screenGeometry.topLeft();
- m_windowHandle->setPosition(pos);
+ m_delegate->setGeometry(m_host, QRect(pos, windowGeometry.size()));
return;
}
case RaiseWindowHook: {
+ if (!m_windowId)
+ return;
+
+ 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);
@@ -190,39 +197,85 @@
}
void AbstractWindowContext::notifyWinIdChange() {
- if (!m_internalEnabled)
- return;
+ auto oldWinId = m_windowId;
+ m_windowId = m_winIdChangeEventFilter->winId();
- auto oldWindow = m_windowHandle;
- if (oldWindow == m_windowHandle)
- return;
- auto isDestroyed = oldWindow && m_windowHandleCache.isNull();
- m_windowHandle = m_delegate->window(m_host);
- m_windowHandleCache = m_windowHandle;
- winIdChanged(oldWindow, isDestroyed);
- }
+ // 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);
- void AbstractWindowContext::setEnabled(bool enabled) {
- if (enabled == m_internalEnabled)
- return;
- m_internalEnabled = enabled;
-
- if (enabled) {
- m_windowHandle = m_delegate->window(m_host);
- m_windowHandleCache = m_windowHandle;
- if (m_windowHandle) {
- winIdChanged(nullptr, false);
- }
- return;
+ if (oldWinId != m_windowId) {
+ winIdChanged(m_windowId, oldWinId);
}
- if (!m_windowHandle)
- return;
+ if (m_windowHandle) {
+ m_windowHandle->installEventFilter(this);
- auto oldWindow = m_windowHandle;
- m_windowHandle = nullptr;
- m_windowHandleCache.clear();
- winIdChanged(oldWindow, false);
+ // 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