From 8069305d52e0b9c63051af8a6ec8861ef020b0cf Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周五, 23 2月 2024 13:21:24 +0800
Subject: [PATCH] minor tweaks
---
src/core/contexts/abstractwindowcontext.cpp | 48 +++++++++++++-----------------------------------
1 files changed, 13 insertions(+), 35 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 8fa851a..2665ac4 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -7,34 +7,12 @@
#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:
@@ -77,16 +55,10 @@
}
m_host = host;
m_delegate.reset(delegate);
- m_winIdChangeEventFilter = std::make_unique<WinIdChangeEventFilter>(host, this);
+ m_winIdChangeEventFilter.reset(delegate->createWinIdEventFilter(host, this));
m_windowEventFilter = std::make_unique<WindowEventFilter>(m_windowHandle, this);
-
- m_windowHandle = m_delegate->hostWindow(m_host);
- if (m_windowHandle) {
- winIdChanged();
- }
+ notifyWinIdChange();
}
-
-
bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
Q_ASSERT(obj);
@@ -213,7 +185,7 @@
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);
@@ -227,7 +199,7 @@
}
case RaiseWindowHook: {
- if (!m_windowHandle)
+ if (!m_windowId)
return;
m_delegate->setWindowVisible(m_host, true);
@@ -259,15 +231,21 @@
}
void AbstractWindowContext::notifyWinIdChange() {
- auto windowEventFilter = static_cast<WindowEventFilter *>(m_windowEventFilter.get());
- windowEventFilter->setWindow(nullptr);
+ auto oldWinId = m_windowId;
+ m_windowId = m_winIdChangeEventFilter->winId();
// 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();
+
+ auto windowEventFilter = static_cast<WindowEventFilter *>(m_windowEventFilter.get());
+ windowEventFilter->setWindow(nullptr);
+
+ if (oldWinId != m_windowId) {
+ winIdChanged(m_windowId, oldWinId);
+ }
if (m_windowHandle) {
windowEventFilter->setWindow(m_windowHandle);
--
Gitblit v1.9.1