From cc65c4da6ad762e8648b2ab6a801e07c50922d3d Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周二, 04 2月 2025 21:58:21 +0800
Subject: [PATCH] fix compilation error
---
src/widgets/widgetwindowagent_win.cpp | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/widgets/widgetwindowagent_win.cpp b/src/widgets/widgetwindowagent_win.cpp
index 706e865..2e08d04 100644
--- a/src/widgets/widgetwindowagent_win.cpp
+++ b/src/widgets/widgetwindowagent_win.cpp
@@ -8,6 +8,8 @@
#include <QtCore/QDateTime>
#include <QtGui/QPainter>
+#include <QtCore/private/qcoreapplication_p.h>
+
#include <QWKCore/qwindowkit_windows.h>
#include <QWKCore/private/qwkglobal_p.h>
#include <QWKCore/private/windows10borderhandler_p.h>
@@ -62,8 +64,13 @@
}
inline void forwardEventToWidgetAndDraw(QWidget *w, QEvent *event) {
- // Let the widget paint first
- static_cast<QObject *>(w)->event(event);
+ // https://github.com/qt/qtbase/blob/e26a87f1ecc40bc8c6aa5b889fce67410a57a702/src/widgets/kernel/qapplication.cpp#L3286
+ // Deliver the event
+ if (!forwardObjectEventFilters(this, w, event)) {
+ // Let the widget paint first
+ std::ignore = static_cast<QObject *>(w)->event(event);
+ QCoreApplicationPrivate::setEventSpontaneous(event, false);
+ }
// 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
@@ -72,8 +79,13 @@
}
inline void forwardEventToWindowAndDraw(QWindow *window, QEvent *event) {
- // Let Qt paint first
- static_cast<QObject *>(window)->event(event);
+ // https://github.com/qt/qtbase/blob/e26a87f1ecc40bc8c6aa5b889fce67410a57a702/src/widgets/kernel/qapplication.cpp#L3286
+ // Deliver the event
+ if (!forwardObjectEventFilters(ctx, window, event)) {
+ // Let Qt paint first
+ std::ignore = static_cast<QObject *>(window)->event(event);
+ QCoreApplicationPrivate::setEventSpontaneous(event, false);
+ }
// 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.
@@ -93,9 +105,18 @@
// Since a QExposeEvent will be sent immediately after the QResizeEvent, we can
// simply ignore it.
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+ struct ExposeEvent : public QExposeEvent {
+ inline const QRegion &getRegion() const { return m_region; }
+ };
+ auto ee = static_cast<ExposeEvent *>(event);
+ bool exposeRegionValid = !ee->getRegion().isNull();
+#else
auto ee = static_cast<QExposeEvent *>(event);
+ bool exposeRegionValid = !ee->region().isNull();
+#endif
auto window = widget->windowHandle();
- if (window->isExposed() && isNormalWindow() && !ee->region().isNull()) {
+ if (window->isExposed() && isNormalWindow() && exposeRegionValid) {
forwardEventToWindowAndDraw(window, event);
return true;
}
--
Gitblit v1.9.1