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/quick/quickwindowagent_p.h | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/quick/quickwindowagent_p.h b/src/quick/quickwindowagent_p.h index d1e7eb4..ec0042d 100644 --- a/src/quick/quickwindowagent_p.h +++ b/src/quick/quickwindowagent_p.h @@ -1,12 +1,26 @@ +// 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 QUICKWINDOWAGENTPRIVATE_H #define QUICKWINDOWAGENTPRIVATE_H -#include <QWKCore/private/corewindowagent_p.h> +// +// W A R N I N G !!! +// ----------------- +// +// This file is not part of the QWindowKit API. It is used purely as an +// implementation detail. This header file may change from version to +// version without notice, or may even be removed. +// + +#include <QWKCore/qwkconfig.h> +#include <QWKCore/private/windowagentbase_p.h> #include <QWKQuick/quickwindowagent.h> namespace QWK { - class QuickWindowAgentPrivate : public CoreWindowAgentPrivate { + class QuickWindowAgentPrivate : public WindowAgentBasePrivate { Q_DECLARE_PUBLIC(QuickWindowAgent) public: QuickWindowAgentPrivate(); @@ -14,12 +28,19 @@ void init(); - AbstractWindowContext * createContext() const override; - // Host QQuickWindow *hostWindow{}; + +#ifdef Q_OS_MAC + QQuickItem *systemButtonAreaItem{}; + std::unique_ptr<QObject> systemButtonAreaItemHandler; +#endif + +#if defined(Q_OS_WINDOWS) && QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS) + void setupWindows10BorderWorkaround(); +#endif }; } -#endif // QUICKWINDOWAGENTPRIVATE_H \ No newline at end of file +#endif // QUICKWINDOWAGENTPRIVATE_H -- Gitblit v1.9.1