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.h | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/widgets/widgetwindowagent.h b/src/widgets/widgetwindowagent.h index 81e454c..4a0f9c8 100644 --- a/src/widgets/widgetwindowagent.h +++ b/src/widgets/widgetwindowagent.h @@ -1,37 +1,49 @@ +// Copyright (C) 2023-2024 Stdware Collections (https://www.github.com/stdware) +// Copyright (C) 2021-2023 wangwenx190 (Yuhang Zhao) +// SPDX-License-Identifier: Apache-2.0 + #ifndef WIDGETWINDOWAGENT_H #define WIDGETWINDOWAGENT_H #include <QtWidgets/QWidget> -#include <QWKCore/corewindowagent.h> +#include <QWKCore/windowagentbase.h> #include <QWKWidgets/qwkwidgetsglobal.h> namespace QWK { class WidgetWindowAgentPrivate; - class QWK_WIDGETS_EXPORT WidgetWindowAgent : public CoreWindowAgent { + class QWK_WIDGETS_EXPORT WidgetWindowAgent : public WindowAgentBase { Q_OBJECT Q_DECLARE_PRIVATE(WidgetWindowAgent) public: explicit WidgetWindowAgent(QObject *parent = nullptr); - ~WidgetWindowAgent(); + ~WidgetWindowAgent() override; public: bool setup(QWidget *w); - bool isHitTestVisible(QWidget *w) const; - void setHitTestVisible(QWidget *w, bool visible); - void setHitTestVisible(const QRect &rect, bool visible); + QWidget *titleBar() const; + void setTitleBar(QWidget *w); QWidget *systemButton(SystemButton button) const; void setSystemButton(SystemButton button, QWidget *w); - QWidget *titleBar() const; - void setTitleBar(QWidget *w); +#ifdef Q_OS_MAC + // The system button area APIs are experimental, very likely to change in the future. + QWidget *systemButtonArea() const; + void setSystemButtonArea(QWidget *widget); + + ScreenRectCallback systemButtonAreaCallback() const; + void setSystemButtonAreaCallback(const ScreenRectCallback &callback); +#endif + + bool isHitTestVisible(const QWidget *w) const; + void setHitTestVisible(QWidget *w, bool visible = true); Q_SIGNALS: - void titleBarWidgetChanged(QWidget *w); + void titleBarChanged(QWidget *w); void systemButtonChanged(SystemButton button, QWidget *w); protected: -- Gitblit v1.9.1