From 2d2fc799bc698ebf7e7c8bcc394366d0d7bf071b Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 20 2月 2024 18:18:39 +0800
Subject: [PATCH] Partially finish the bug after window close and reshow
---
src/core/contexts/abstractwindowcontext.cpp | 106 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 68 insertions(+), 38 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 8672faf..8fa851a 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>
@@ -37,7 +41,18 @@
explicit WindowEventFilter(QWindow *window, AbstractWindowContext *ctx,
QObject *parent = nullptr)
: QObject(parent), ctx(ctx), window(window) {
- window->installEventFilter(this);
+ if (window)
+ window->installEventFilter(this);
+ }
+
+ inline void setWindow(QWindow *win) {
+ if (auto oldWin = window.data(); oldWin) {
+ oldWin->removeEventFilter(this);
+ }
+ window = win;
+ if (win) {
+ win->installEventFilter(this);
+ }
}
protected:
@@ -47,7 +62,7 @@
protected:
AbstractWindowContext *ctx;
- QWindow *window;
+ QPointer<QWindow> window;
};
}
@@ -63,40 +78,15 @@
m_host = host;
m_delegate.reset(delegate);
m_winIdChangeEventFilter = std::make_unique<WinIdChangeEventFilter>(host, this);
+ m_windowEventFilter = std::make_unique<WindowEventFilter>(m_windowHandle, this);
m_windowHandle = m_delegate->hostWindow(m_host);
if (m_windowHandle) {
winIdChanged();
- m_windowEventFilter = std::make_unique<WindowEventFilter>(m_windowHandle, this);
}
}
- 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::setHitTestVisible(const QObject *obj, bool visible) {
Q_ASSERT(obj);
@@ -145,8 +135,8 @@
}
#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
@@ -226,16 +216,21 @@
if (!m_windowHandle)
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)
+ 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);
@@ -264,14 +259,18 @@
}
void AbstractWindowContext::notifyWinIdChange() {
- auto oldWindow = m_windowHandle;
+ auto windowEventFilter = static_cast<WindowEventFilter *>(m_windowEventFilter.get());
+ windowEventFilter->setWindow(nullptr);
+
+ // 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.
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);
+ windowEventFilter->setWindow(m_windowHandle);
// Refresh window attributes
auto attributes = m_windowAttributes;
@@ -285,6 +284,37 @@
}
}
+ 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::windowAttributeChanged(const QString &key,
const QVariant &attribute,
const QVariant &oldAttribute) {
--
Gitblit v1.9.1