From 29901fc2a97eedd3c914f807d1819c9ea7e69973 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周一, 25 12月 2023 17:53:34 +0800
Subject: [PATCH] Optimize Windows 10 border handling
---
src/widgets/widgetwindowagent_win.cpp | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/src/widgets/widgetwindowagent_win.cpp b/src/widgets/widgetwindowagent_win.cpp
index dc35a17..9e49d38 100644
--- a/src/widgets/widgetwindowagent_win.cpp
+++ b/src/widgets/widgetwindowagent_win.cpp
@@ -1,9 +1,10 @@
#include "widgetwindowagent_p.h"
+#include <QtCore/QDebug>
+#include <QtCore/QDateTime>
#include <QtGui/QPainter>
#include <QWKCore/qwindowkit_windows.h>
-#include <QWKCore/qwkconfig.h>
#include <QWKCore/private/nativeeventfilter_p.h>
namespace QWK {
@@ -12,19 +13,21 @@
class WidgetBorderHandler;
- class WidgetBorderHandler : public QObject, public NativeEventFilter {
+ class WidgetBorderHandler : public QObject, public NativeEventFilter, public SharedEventFilter {
public:
explicit WidgetBorderHandler(QWidget *widget, AbstractWindowContext *ctx)
: QObject(ctx), widget(widget), ctx(ctx) {
widget->installEventFilter(this);
ctx->installNativeEventFilter(this);
+ ctx->installSharedEventFilter(this);
+
updateGeometry();
}
inline bool isNormalWindow() const {
- return widget->windowState() &
- (Qt::WindowMinimized | Qt::WindowMaximized | Qt::WindowFullScreen);
+ return !(widget->windowState() &
+ (Qt::WindowMinimized | Qt::WindowMaximized | Qt::WindowFullScreen));
}
void updateGeometry() {
@@ -66,19 +69,48 @@
}
break;
}
+# if 0
+ case WM_ACTIVATE: {
+ if (LOWORD(msg->wParam) == WA_INACTIVE) {
+ // 绐楀彛澶卞幓婵�娲荤姸鎬�
+ } else {
+ // 绐楀彛琚縺娲�
+ }
+ break;
+ }
+# endif
- case WM_PAINT: {
+ default:
+ break;
+ }
+ return false;
+ }
+
+ bool sharedEventFilter(QObject *obj, QEvent *event) override {
+ Q_UNUSED(obj)
+
+ auto window = widget->windowHandle();
+ if (event->type() == QEvent::Expose) {
+ // Qt will absolutely send a QExposeEvent to the QWindow when it receives a
+ // WM_PAINT message. When the control flow enters the expose handler, Qt must
+ // have already called BeginPaint() and it's the best time for us to draw the
+ // top border.
+ auto ee = static_cast<QExposeEvent *>(event);
+ if (isNormalWindow() && window->isExposed() && !ee->region().isNull()) {
+ // Friend class helping to call `event`
+ class HackedWindow : public QWindow {
+ public:
+ friend class QWK::WidgetBorderHandler;
+ };
+
// Let Qt paint first
- m_dispatcher->resume(eventType, message, result);
+ static_cast<HackedWindow *>(window)->event(event);
// Upon receiving the WM_PAINT message, Qt will redraw the entire view, and we
// must wait for it to finish redrawing before drawing this top border area
ctx->virtual_hook(AbstractWindowContext::DrawWindows10BorderHook2, nullptr);
return true;
}
-
- default:
- break;
}
return false;
}
@@ -87,6 +119,9 @@
Q_UNUSED(obj)
switch (event->type()) {
case QEvent::UpdateRequest: {
+ if (!isNormalWindow())
+ break;
+
// Friend class helping to call `event`
class HackedWidget : public QWidget {
public:
@@ -123,16 +158,14 @@
QWidget *widget;
AbstractWindowContext *ctx;
};
-#endif
void WidgetWindowAgentPrivate::setupWindows10BorderWorkaround() {
-#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
// Install painting hook
auto ctx = context.get();
if (ctx->property("needBorderPainter").toBool()) {
std::ignore = new WidgetBorderHandler(hostWidget, ctx);
}
-#endif
}
+#endif
}
--
Gitblit v1.9.1