From f916057f79f045a975d29929b9f21448541d79b2 Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周五, 05 1月 2024 17:41:45 +0800
Subject: [PATCH] Fix mac multiple window crash
---
src/widgets/widgetwindowagent_win.cpp | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/widgets/widgetwindowagent_win.cpp b/src/widgets/widgetwindowagent_win.cpp
index 72d0057..f192f6b 100644
--- a/src/widgets/widgetwindowagent_win.cpp
+++ b/src/widgets/widgetwindowagent_win.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 "widgetwindowagent_p.h"
#include <QtCore/QDebug>
@@ -5,6 +9,7 @@
#include <QtGui/QPainter>
#include <QWKCore/qwindowkit_windows.h>
+#include <QWKCore/private/qwkglobal_p.h>
namespace QWK {
@@ -68,14 +73,8 @@
}
inline void resumeWidgetEventAndDraw(QWidget *w, QEvent *event) {
- // Friend class helping to call `event`
- class HackedWidget : public QWidget {
- public:
- friend class QWK::WidgetBorderHandler;
- };
-
// Let the widget paint first
- static_cast<HackedWidget *>(w)->event(event);
+ Private::ObjectHelper::sendEvent(w, event);
// Due to the timer or user action, Qt will repaint some regions spontaneously,
// even if there is no WM_PAINT message, we must wait for it to finish painting
@@ -84,14 +83,8 @@
}
inline void resumeWindowEventAndDraw(QWindow *window, QEvent *event) {
- // Friend class helping to call `event`
- class HackedWindow : public QWindow {
- public:
- friend class QWK::WidgetBorderHandler;
- };
-
// Let Qt paint first
- static_cast<HackedWindow *>(window)->event(event);
+ Private::ObjectHelper::sendEvent(window, event);
// Upon receiving the WM_PAINT message, Qt will repaint the entire view, and we
// must wait for it to finish painting before drawing this top border area.
--
Gitblit v1.9.1