From 5e1c012c539e74804454d45a1b945093afdb8f4f Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周日, 09 2月 2025 11:15:59 +0800
Subject: [PATCH] apply some fixes and workarounds
---
src/widgets/widgetwindowagent_win.cpp | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/src/widgets/widgetwindowagent_win.cpp b/src/widgets/widgetwindowagent_win.cpp
index 13af840..1522cab 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>
@@ -53,8 +55,16 @@
}
void updateGeometry() override {
- widget->setContentsMargins(isNormalWindow() ? QMargins(0, borderThickness(), 0, 0)
- : QMargins());
+ // The window top border is manually painted by QWK so we want to give
+ // some margins to avoid it covering real window contents, however, we
+ // found that there are some rounding issues for the thin border and
+ // thus this small trick doesn't work very well when the DPR is not
+ // integer. So far we haven't found a perfect solution, so just don't
+ // set any margins. In theory the window content will only be covered
+ // by 1px or so, it should not be a serious issue in the real world.
+ //
+ // widget->setContentsMargins(isNormalWindow() ? QMargins(0, borderThickness(), 0, 0)
+ // : QMargins());
}
bool isWindowActive() const override {
@@ -62,8 +72,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 +87,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.
@@ -84,7 +104,6 @@
bool sharedEventFilter(QObject *obj, QEvent *event) override {
Q_UNUSED(obj)
- auto window = widget->windowHandle();
switch (event->type()) {
case QEvent::Expose: {
// Qt will absolutely send a QExposeEvent or QResizeEvent to the QWindow when it
@@ -94,8 +113,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);
- if (window->isExposed() && isNormalWindow() && !ee->region().isNull()) {
+ bool exposeRegionValid = !ee->region().isNull();
+#endif
+ auto window = widget->windowHandle();
+ if (window->isExposed() && isNormalWindow() && exposeRegionValid) {
forwardEventToWindowAndDraw(window, event);
return true;
}
--
Gitblit v1.9.1