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 | 184 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 140 insertions(+), 44 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 1669cd4..8fa851a 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -1,12 +1,71 @@
+// 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) {
+ 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:
+ bool eventFilter(QObject *obj, QEvent *event) override {
+ return ctx->sharedDispatch(obj, event);
+ }
+
+ protected:
+ AbstractWindowContext *ctx;
+ QPointer<QWindow> window;
+ };
+
+ }
AbstractWindowContext::AbstractWindowContext() = default;
@@ -18,23 +77,16 @@
}
m_host = host;
m_delegate.reset(delegate);
- setEnabled(true);
+ 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();
+ }
}
- 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 *a[] = {
- &const_cast<QString &>(key),
- &newVar,
- &oldVar,
- };
- virtual_hook(WindowAttributeChangedHook, a);
- }
bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
Q_ASSERT(obj);
@@ -69,13 +121,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 +213,24 @@
void AbstractWindowContext::virtual_hook(int id, void *data) {
switch (id) {
case CentralizeHook: {
+ 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);
@@ -190,39 +259,66 @@
}
void AbstractWindowContext::notifyWinIdChange() {
- if (!m_internalEnabled)
- return;
+ auto windowEventFilter = static_cast<WindowEventFilter *>(m_windowEventFilter.get());
+ windowEventFilter->setWindow(nullptr);
- 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.
+ m_windowHandle = m_delegate->hostWindow(m_host);
+ winIdChanged();
+
+ if (m_windowHandle) {
+ windowEventFilter->setWindow(m_windowHandle);
+
+ // 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());
+ }
+ }
}
- void AbstractWindowContext::setEnabled(bool enabled) {
- if (enabled == m_internalEnabled)
- return;
- m_internalEnabled = enabled;
+ QVariant AbstractWindowContext::windowAttribute(const QString &key) const {
+ return m_windowAttributes.value(key);
+ }
- if (enabled) {
- m_windowHandle = m_delegate->window(m_host);
- m_windowHandleCache = m_windowHandle;
- if (m_windowHandle) {
- winIdChanged(nullptr, false);
+ 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;
}
- return;
+ if (!m_windowHandle || !windowAttributeChanged(key, attribute, {})) {
+ return false;
+ }
+ m_windowAttributes.insert(key, attribute);
+ return true;
}
- if (!m_windowHandle)
- return;
+ if (it.value() == attribute)
+ return true;
+ if (!m_windowHandle || !windowAttributeChanged(key, attribute, it.value())) {
+ return false;
+ }
- auto oldWindow = m_windowHandle;
- m_windowHandle = nullptr;
- m_windowHandleCache.clear();
- winIdChanged(oldWindow, 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) {
+ return false;
}
}
--
Gitblit v1.9.1