From 3bde231e6d0b1c177c8c1fc4eccb6207d40aeec1 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周一, 25 12月 2023 00:59:34 +0800
Subject: [PATCH] Test on MinGW
---
src/widgets/widgetwindowagent_win.cpp | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/src/widgets/widgetwindowagent_win.cpp b/src/widgets/widgetwindowagent_win.cpp
index 7901bac..dc35a17 100644
--- a/src/widgets/widgetwindowagent_win.cpp
+++ b/src/widgets/widgetwindowagent_win.cpp
@@ -22,16 +22,21 @@
updateGeometry();
}
+ inline bool isNormalWindow() const {
+ return widget->windowState() &
+ (Qt::WindowMinimized | Qt::WindowMaximized | Qt::WindowFullScreen);
+ }
+
void updateGeometry() {
- if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen)) {
- widget->setContentsMargins({});
- } else {
+ if (isNormalWindow()) {
widget->setContentsMargins({
0,
ctx->property("borderThickness").toInt(),
0,
0,
});
+ } else {
+ widget->setContentsMargins({});
}
}
@@ -62,6 +67,16 @@
break;
}
+ case WM_PAINT: {
+ // Let Qt paint first
+ m_dispatcher->resume(eventType, message, result);
+
+ // 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;
}
@@ -71,32 +86,20 @@
bool eventFilter(QObject *obj, QEvent *event) override {
Q_UNUSED(obj)
switch (event->type()) {
- case QEvent::Paint: {
- if (widget->windowState() &
- (Qt::WindowMinimized | Qt::WindowMaximized | Qt::WindowFullScreen))
- break;
-
+ case QEvent::UpdateRequest: {
// Friend class helping to call `event`
class HackedWidget : public QWidget {
public:
- friend class WidgetBorderHandler;
+ friend class QWK::WidgetBorderHandler;
};
// Let the widget paint first
static_cast<HackedWidget *>(widget)->event(event);
- // Draw border
- auto paintEvent = static_cast<QPaintEvent *>(event);
- auto rect = paintEvent->rect();
- auto region = paintEvent->region();
-
- QPainter painter(widget);
- void *args[] = {
- &painter,
- &rect,
- ®ion,
- };
- ctx->virtual_hook(AbstractWindowContext::DrawWindows10BorderHook, args);
+ // Due to the timer or user action, Qt will redraw some regions spontaneously,
+ // even if there is no WM_PAINT message, we must wait for it to finish redrawing
+ // and then update the upper border area
+ ctx->virtual_hook(AbstractWindowContext::DrawWindows10BorderHook2, nullptr);
return true;
}
--
Gitblit v1.9.1