From e9f790d3533ebaee1f782e91b6e13b2c6375c86a Mon Sep 17 00:00:00 2001
From: SineStriker <55847490+SineStriker@users.noreply.github.com>
Date: 周二, 11 2月 2025 23:06:01 +0800
Subject: [PATCH] AWC: fix window attribute handler
---
src/core/contexts/abstractwindowcontext.cpp | 230 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 137 insertions(+), 93 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 32efc02..22e3c64 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -1,56 +1,16 @@
+// 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 <memory>
#include "qwkglobal_p.h"
namespace QWK {
-
- namespace {
-
- class WinIdChangeEventFilter : public QObject {
- public:
- explicit WinIdChangeEventFilter(QObject *widget, AbstractWindowContext *ctx,
- QObject *parent = nullptr)
- : QObject(parent), ctx(ctx) {
- widget->installEventFilter(this);
- }
-
- protected:
- bool eventFilter(QObject *obj, QEvent *event) override {
- Q_UNUSED(obj)
- if (event->type() == QEvent::WinIdChange) {
- ctx->notifyWinIdChange();
- }
- return false;
- }
-
- protected:
- AbstractWindowContext *ctx;
- };
-
- class WindowEventFilter : public QObject {
- public:
- explicit WindowEventFilter(QWindow *window, AbstractWindowContext *ctx,
- QObject *parent = nullptr)
- : QObject(parent), ctx(ctx), window(window) {
- window->installEventFilter(this);
- }
-
- protected:
- bool eventFilter(QObject *obj, QEvent *event) override {
- return ctx->sharedDispatch(obj, event);
- }
-
- protected:
- AbstractWindowContext *ctx;
- QWindow *window;
- };
-
- }
AbstractWindowContext::AbstractWindowContext() = default;
@@ -62,27 +22,31 @@
}
m_host = host;
m_delegate.reset(delegate);
- m_winIdChangeEventFilter = std::make_unique<WinIdChangeEventFilter>(host, this);
-
- m_windowHandle = m_delegate->hostWindow(m_host);
- if (m_windowHandle) {
- winIdChanged();
- m_windowEventFilter = std::make_unique<WindowEventFilter>(m_windowHandle, this);
- }
+ m_winIdChangeEventFilter.reset(delegate->createWinIdEventFilter(host, this));
+ notifyWinIdChange();
}
-
-
- bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
+ bool AbstractWindowContext::setHitTestVisible(QObject *obj, bool visible) {
Q_ASSERT(obj);
if (!obj) {
return false;
}
+ auto it = m_hitTestVisibleItems.find(obj);
if (visible) {
+ if (it != m_hitTestVisibleItems.end()) {
+ return true;
+ }
+ connect(obj, &QObject::destroyed, this,
+ &AbstractWindowContext::_q_hitTestVisibleItemDestroyed);
m_hitTestVisibleItems.insert(obj);
} else {
- m_hitTestVisibleItems.remove(obj);
+ if (it == m_hitTestVisibleItems.end()) {
+ return false;
+ }
+ disconnect(obj, &QObject::destroyed, this,
+ &AbstractWindowContext::_q_hitTestVisibleItemDestroyed);
+ m_hitTestVisibleItems.erase(it);
}
return true;
}
@@ -94,8 +58,18 @@
return false;
}
- if (m_systemButtons[button] == obj) {
- return false;
+ auto org = m_systemButtons[button];
+ if (org == obj) {
+ return true;
+ }
+
+ if (org) {
+ disconnect(org, &QObject::destroyed, this,
+ &AbstractWindowContext::_q_systemButtonDestroyed);
+ }
+ if (obj) {
+ connect(obj, &QObject::destroyed, this,
+ &AbstractWindowContext::_q_systemButtonDestroyed);
}
m_systemButtons[button] = obj;
return true;
@@ -103,25 +77,26 @@
bool AbstractWindowContext::setTitleBar(QObject *item) {
Q_ASSERT(item);
- if (m_titleBar == item) {
+ auto org = m_titleBar;
+ if (org == item) {
return false;
}
- if (m_titleBar) {
+ if (org) {
// 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();
+ removeSystemButtonsAndHitTestItems();
+ disconnect(org, &QObject::destroyed, this,
+ &AbstractWindowContext::_q_titleBarDistroyed);
}
-
+ if (item) {
+ connect(item, &QObject::destroyed, this, &AbstractWindowContext::_q_titleBarDistroyed);
+ }
m_titleBar = item;
return true;
}
#ifdef Q_OS_MAC
- void
- AbstractWindowContext::setSystemButtonAreaCallback(const ScreenRectCallback &callback) {
+ void AbstractWindowContext::setSystemButtonAreaCallback(const ScreenRectCallback &callback) {
m_systemButtonAreaCallback = callback;
virtual_hook(SystemButtonAreaChangedHook, nullptr);
}
@@ -199,20 +174,21 @@
void AbstractWindowContext::virtual_hook(int id, void *data) {
switch (id) {
case CentralizeHook: {
- if (!m_windowHandle)
+ 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_windowHandle)
+ if (!m_windowId)
return;
m_delegate->setWindowVisible(m_host, true);
@@ -244,29 +220,51 @@
}
void AbstractWindowContext::notifyWinIdChange() {
- auto oldWindow = m_windowHandle;
- m_windowHandle = m_delegate->hostWindow(m_host);
- if (oldWindow == m_windowHandle)
- return;
- m_windowEventFilter.reset();
- winIdChanged();
- if (m_windowHandle) {
- m_windowEventFilter = std::make_unique<WindowEventFilter>(m_windowHandle, this);
+ auto oldWinId = m_windowId;
+ m_windowId = m_winIdChangeEventFilter->winId();
- // 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;
+ // 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);
+ }
+
+ auto oldWindowHandle = m_windowHandle.data();
+ m_windowHandle = m_delegate->hostWindow(m_host);
+
+ if (oldWinId != m_windowId) {
+ winIdChanged(m_windowId, oldWinId);
+
+ if (m_windowId) {
+ // Installing twice has no side-effect.
+ m_windowHandle->installEventFilter(this);
+
+ // Refresh window attributes
+ for (auto it = m_windowAttributesOrder.begin();
+ it != m_windowAttributesOrder.end();) {
+ if (!windowAttributeChanged(it->first, it->second, {})) {
+ m_windowAttributes.remove(it->first);
+ it = m_windowAttributesOrder.erase(it);
+ continue;
+ }
+ ++it;
}
- m_windowAttributes.insert(it.key(), it.value());
}
+
+ // Send to shared dispatchers
+ QEvent e(QEvent::WinIdChange);
+ sharedDispatch(m_host, &e);
}
}
QVariant AbstractWindowContext::windowAttribute(const QString &key) const {
- return m_windowAttributes.value(key);
+ auto it = m_windowAttributes.find(key);
+ if (it == m_windowAttributes.end()) {
+ return {};
+ }
+ return it.value()->second;
}
bool AbstractWindowContext::setWindowAttribute(const QString &key, const QVariant &attribute) {
@@ -275,25 +273,37 @@
if (!attribute.isValid()) {
return true;
}
- if (!m_windowHandle || !windowAttributeChanged(key, attribute, {})) {
+ if (m_windowId && !windowAttributeChanged(key, attribute, {})) {
return false;
}
- m_windowAttributes.insert(key, attribute);
+ m_windowAttributes.insert(
+ key, m_windowAttributesOrder.insert(m_windowAttributesOrder.end(),
+ std::make_pair(key, attribute)));
return true;
}
- if (it.value() == attribute)
- return true;
- if (!m_windowHandle || !windowAttributeChanged(key, attribute, it.value())) {
+ auto &listIter = it.value();
+ auto &oldAttr = listIter->second;
+ if (m_windowId && !windowAttributeChanged(key, attribute, oldAttr)) {
return false;
}
if (attribute.isValid()) {
- it.value() = attribute;
+ oldAttr = attribute;
+ m_windowAttributesOrder.splice(m_windowAttributesOrder.end(), m_windowAttributesOrder,
+ listIter);
} else {
+ m_windowAttributesOrder.erase(listIter);
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,
@@ -302,4 +312,38 @@
return false;
}
+ void AbstractWindowContext::removeSystemButtonsAndHitTestItems() {
+ for (auto &button : m_systemButtons) {
+ if (!button) {
+ continue;
+ }
+ disconnect(button, &QObject::destroyed, this,
+ &AbstractWindowContext::_q_systemButtonDestroyed);
+ button = nullptr;
+ }
+ for (auto &item : m_hitTestVisibleItems) {
+ disconnect(item, &QObject::destroyed, this,
+ &AbstractWindowContext::_q_hitTestVisibleItemDestroyed);
+ }
+ m_hitTestVisibleItems.clear();
+ }
+
+ void AbstractWindowContext::_q_titleBarDistroyed(QObject *obj) {
+ Q_UNUSED(obj)
+ removeSystemButtonsAndHitTestItems();
+ m_titleBar = nullptr;
+ }
+
+ void AbstractWindowContext::_q_hitTestVisibleItemDestroyed(QObject *obj) {
+ m_hitTestVisibleItems.remove(obj);
+ }
+
+ void AbstractWindowContext::_q_systemButtonDestroyed(QObject *obj) {
+ for (auto &item : m_systemButtons) {
+ if (item == obj) {
+ item = nullptr;
+ }
+ }
+ }
+
}
--
Gitblit v1.9.1