From 6c0043c1e3d97398828fbd56448f1cd8ee201e66 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周五, 23 2月 2024 01:01:10 +0800
Subject: [PATCH] Fix bug of window closing and reshowing
---
src/core/contexts/abstractwindowcontext_p.h | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index f375b83..e7711d7 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -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
+
#ifndef ABSTRACTWINDOWCONTEXT_P_H
#define ABSTRACTWINDOWCONTEXT_P_H
@@ -22,6 +26,7 @@
#include <QWKCore/private/nativeeventfilter_p.h>
#include <QWKCore/private/sharedeventfilter_p.h>
#include <QWKCore/private/windowitemdelegate_p.h>
+#include <QWKCore/private/winidchangeeventfilter_p.h>
namespace QWK {
@@ -77,7 +82,7 @@
virtual bool setWindowAttribute(const QString &key, const QVariant &attribute);
protected:
- virtual void winIdChanged() = 0;
+ virtual void winIdChanged(WId winId, WId oldWinId) = 0;
virtual bool windowAttributeChanged(const QString &key, const QVariant &attribute,
const QVariant &oldAttribute);
@@ -85,6 +90,7 @@
QObject *m_host{};
std::unique_ptr<WindowItemDelegate> m_delegate;
QWindow *m_windowHandle{};
+ WId m_windowId{};
QSet<const QObject *> m_hitTestVisibleItems;
#ifdef Q_OS_MAC
@@ -97,7 +103,7 @@
QVariantHash m_windowAttributes;
std::unique_ptr<QObject> m_windowEventFilter;
- std::unique_ptr<QObject> m_winIdChangeEventFilter;
+ std::unique_ptr<WinIdChangeEventFilter> m_winIdChangeEventFilter;
};
inline QObject *AbstractWindowContext::host() const {
--
Gitblit v1.9.1