From 6b2d31247dc2c2804e571b31a71c8a423c1db9d4 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 26 12月 2023 01:44:03 +0800
Subject: [PATCH] Totally fix top border issue on Win10 for QtWidgets
---
src/widgets/widgetwindowagent_win.cpp | 59 ++++++++++++++++++++++++++---------------------------------
1 files changed, 26 insertions(+), 33 deletions(-)
diff --git a/src/widgets/widgetwindowagent_win.cpp b/src/widgets/widgetwindowagent_win.cpp
index 9e49d38..3eb6beb 100644
--- a/src/widgets/widgetwindowagent_win.cpp
+++ b/src/widgets/widgetwindowagent_win.cpp
@@ -5,19 +5,23 @@
#include <QtGui/QPainter>
#include <QWKCore/qwindowkit_windows.h>
-#include <QWKCore/private/nativeeventfilter_p.h>
namespace QWK {
#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
- class WidgetBorderHandler;
-
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);
@@ -30,14 +34,10 @@
(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({});
}
@@ -54,31 +54,24 @@
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();
- }
- break;
- }
-# if 0
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 needs 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;
}
-# endif
default:
break;
@@ -162,8 +155,8 @@
void WidgetWindowAgentPrivate::setupWindows10BorderWorkaround() {
// 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
--
Gitblit v1.9.1