From 9dcea027f16c4ce5852da3dfc8aca284c582bd7d Mon Sep 17 00:00:00 2001
From: sola.lu <sola.lu.greentest.com.cn>
Date: 周五, 06 6月 2025 18:19:18 +0800
Subject: [PATCH] 1.注释掉custom margin，解决程序放大后，遮盖窗口底部内容的问题。
---
src/widgets/widgetwindowagent_win.cpp | 189 +++++++++++++++++++++--------------------------
1 files changed, 84 insertions(+), 105 deletions(-)
diff --git a/src/widgets/widgetwindowagent_win.cpp b/src/widgets/widgetwindowagent_win.cpp
index 0f88e1c..f7501e0 100644
--- a/src/widgets/widgetwindowagent_win.cpp
+++ b/src/widgets/widgetwindowagent_win.cpp
@@ -1,26 +1,34 @@
+// Copyright (C) 2023-2024 Stdware Collections (https://www.github.com/stdware)
+// Copyright (C) 2021-2023 wangwenx190 (Yuhang Zhao)
+// SPDX-License-Identifier: Apache-2.0
+
#include "widgetwindowagent_p.h"
#include <QtCore/QDebug>
#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>
namespace QWK {
-#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
// https://github.com/qt/qtbase/blob/e26a87f1ecc40bc8c6aa5b889fce67410a57a702/src/plugins/platforms/windows/qwindowsbackingstore.cpp#L42
// In QtWidgets applications, when repainting happens, QPA at the last calls
// QWindowsBackingStore::flush() to draw the contents of the buffer to the screen, we need to
// call GDI drawing the top border after that.
- // After debugging, we know that there are two situations that will lead to redrawing.
+ // After debugging, we know that there are two situations that will lead to repaint.
//
// 1. Windows sends a WM_PAINT message, after which Qt immediately generates a QExposeEvent or
// QResizeEvent and send it to the corresponding QWidgetWindow instance, calling "flush" at the
// end of its handler.
//
- // 2. When a timer or user input triggers Qt to redraw spontaneously, the corresponding
+ // 2. When a timer or user input triggers Qt to repaint spontaneously, the corresponding
// QWidget receives a QEvent::UpdateRequest event and also calls "flush" at the end of its
// handler.
//
@@ -32,138 +40,110 @@
// returns, because Qt calls BeginPaint() and EndPaint() itself. We should make sure that we
// draw the top border between these two calls, otherwise some display exceptions may arise.
- class WidgetBorderHandler : public QObject, public NativeEventFilter, public SharedEventFilter {
+ class WidgetBorderHandler : public QObject, public Windows10BorderHandler {
public:
explicit WidgetBorderHandler(QWidget *widget, AbstractWindowContext *ctx,
QObject *parent = nullptr)
- : QObject(parent), widget(widget), ctx(ctx) {
+ : QObject(parent), Windows10BorderHandler(ctx), widget(widget) {
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);
-
- // Enable dark mode by default, otherwise the frame borders are white
- 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));
- }
-
- inline void updateGeometry() {
- if (isNormalWindow()) {
- widget->setContentsMargins(
- {0, ctx->windowAttribute(QStringLiteral("border-thickness")).toInt(), 0, 0});
- } else {
- widget->setContentsMargins({});
+ // First update
+ if (ctx->windowId()) {
+ setupNecessaryAttributes();
}
+ WidgetBorderHandler::updateGeometry();
}
- inline void resumeWidgetEvent(QWidget *w, QEvent *event) {
- // Friend class helping to call `event`
- class HackedWidget : public QWidget {
- public:
- friend class QWK::WidgetBorderHandler;
- };
+ void updateGeometry() override {
+ // 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());
+ }
- // Let the widget paint first
- static_cast<HackedWidget *>(w)->event(event);
+ bool isWindowActive() const override {
+ return widget->isActiveWindow();
+ }
- // 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
+ inline void forwardEventToWidgetAndDraw(QWidget *w, QEvent *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
// and then update the top border area.
- ctx->virtual_hook(AbstractWindowContext::DrawWindows10BorderHook2, nullptr);
+ drawBorderNative();
}
- inline void resumeWindowEvent(QWindow *window, QEvent *event) {
- // Friend class helping to call `event`
- class HackedWindow : public QWindow {
- public:
- friend class QWK::WidgetBorderHandler;
- };
+ inline void forwardEventToWindowAndDraw(QWindow *window, QEvent *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);
+ }
- // 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);
+ // 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.
+ drawBorderNative();
}
protected:
- bool nativeEventFilter(const QByteArray &eventType, void *message,
- QT_NATIVE_EVENT_RESULT_TYPE *result) override {
- Q_UNUSED(eventType)
- const auto msg = static_cast<const MSG *>(message);
- switch (msg->message) {
- case WM_DPICHANGED: {
- updateGeometry();
- break;
- }
-
- 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;
- }
-
- default:
- break;
- }
- return false;
- }
-
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
+ // 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.
- // Qt will absolutely send a QExposeEvent or QResizeEvent 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.
-
- // Since a QExposeEvent will be sent immediately after the QResizeEvent, we can simply
- // ignore it.
- if (event->type() == QEvent::Expose) {
- auto ee = static_cast<QExposeEvent *>(event);
- if (window->isExposed() && !ee->region().isNull()) {
- resumeWindowEvent(window, event);
- return true;
+ // 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);
+ bool exposeRegionValid = !ee->region().isNull();
+#endif
+ auto window = widget->windowHandle();
+ if (window->isExposed() && isNormalWindow() && exposeRegionValid) {
+ forwardEventToWindowAndDraw(window, event);
+ return true;
+ }
+ break;
}
+ default:
+ break;
}
-
- return false;
+ return Windows10BorderHandler::sharedEventFilter(obj, event);
}
bool eventFilter(QObject *obj, QEvent *event) override {
Q_UNUSED(obj)
+
switch (event->type()) {
case QEvent::UpdateRequest: {
if (!isNormalWindow())
break;
- resumeWidgetEvent(widget, event);
+ forwardEventToWidgetAndDraw(widget, event);
return true;
}
@@ -185,7 +165,6 @@
}
QWidget *widget;
- AbstractWindowContext *ctx;
};
void WidgetWindowAgentPrivate::setupWindows10BorderWorkaround() {
--
Gitblit v1.9.1