From 54623b054721d42db721d0ba7429b6f8878fc1a5 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 26 12月 2023 02:44:18 +0800
Subject: [PATCH] minor tweaks
---
src/widgets/widgetwindowagent_win.cpp | 114 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 70 insertions(+), 44 deletions(-)
diff --git a/src/widgets/widgetwindowagent_win.cpp b/src/widgets/widgetwindowagent_win.cpp
index dc35a17..2733f94 100644
--- a/src/widgets/widgetwindowagent_win.cpp
+++ b/src/widgets/widgetwindowagent_win.cpp
@@ -1,40 +1,43 @@
#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 {
#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
- 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) {
+ explicit WidgetBorderHandler(QWidget *widget, AbstractWindowContext *ctx,
+ QObject *parent = nullptr)
+ : QObject(parent), widget(widget), ctx(ctx) {
widget->installEventFilter(this);
+ // https://github.com/microsoft/terminal/blob/71a6f26e6ece656084e87de1a528c4a8072eeabd/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp#L940
+ // Must extend top frame to client area
+ static QVariant defaultMargins = QVariant::fromValue(QMargins(0, 1, 0, 0));
+ ctx->setWindowAttribute(QStringLiteral("extra-margins"), defaultMargins);
+ ctx->setWindowAttribute(QStringLiteral("dark-mode"), true);
+
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() {
+ inline void updateGeometry() {
if (isNormalWindow()) {
- widget->setContentsMargins({
- 0,
- ctx->property("borderThickness").toInt(),
- 0,
- 0,
- });
+ widget->setContentsMargins(
+ {0, ctx->windowAttribute(QStringLiteral("border-thickness")).toInt(), 0, 0});
} else {
widget->setContentsMargins({});
}
@@ -51,30 +54,23 @@
break;
}
- case WM_THEMECHANGED:
- case WM_SYSCOLORCHANGE:
- case WM_DWMCOLORIZATIONCOLORCHANGED: {
- widget->update();
- break;
- }
-
- case WM_SETTINGCHANGE: {
- if (!msg->wParam && msg->lParam &&
- std::wcscmp(reinterpret_cast<LPCWSTR>(msg->lParam), L"ImmersiveColorSet") ==
- 0) {
- widget->update();
+ case WM_ACTIVATE: {
+ if (LOWORD(msg->wParam) == WA_INACTIVE) {
+ // https://github.com/microsoft/terminal/blob/71a6f26e6ece656084e87de1a528c4a8072eeabd/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp#L904
+ // When the window is inactive, there is a transparency bug in the top
+ // border, and we need to extend the non-client area to the whole title
+ // bar.
+ QRect frame =
+ ctx->windowAttribute(QStringLiteral("title-bar-rect")).toRect();
+ QMargins margins{0, -frame.top(), 0, 0};
+ ctx->setWindowAttribute(QStringLiteral("extra-margins"),
+ QVariant::fromValue(margins));
+ } else {
+ // Restore margins when the window is active
+ static QVariant defaultMargins = QVariant::fromValue(QMargins(0, 1, 0, 0));
+ ctx->setWindowAttribute(QStringLiteral("extra-margins"), defaultMargins);
}
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:
@@ -83,10 +79,42 @@
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
+ 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;
+ }
+ }
+ return false;
+ }
+
bool eventFilter(QObject *obj, QEvent *event) override {
Q_UNUSED(obj)
switch (event->type()) {
case QEvent::UpdateRequest: {
+ if (!isNormalWindow())
+ break;
+
// Friend class helping to call `event`
class HackedWidget : public QWidget {
public:
@@ -98,7 +126,7 @@
// 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
+ // and then update the top border area.
ctx->virtual_hook(AbstractWindowContext::DrawWindows10BorderHook2, nullptr);
return true;
}
@@ -123,16 +151,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);
+ if (ctx->windowAttribute(QStringLiteral("win10-border-needed")).toBool()) {
+ borderHandler = std::make_unique<WidgetBorderHandler>(hostWidget, ctx);
}
-#endif
}
+#endif
}
--
Gitblit v1.9.1