From 39ba3049f01b30c9a99ad8bb8cd94e117d1c3c65 Mon Sep 17 00:00:00 2001 From: SineStriker <trueful@163.com> Date: ćšć, 28 12æ 2023 20:54:27 +0800 Subject: [PATCH] Fix mistakes of quick module --- src/quick/quickwindowagent_p.h | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/quick/quickwindowagent_p.h b/src/quick/quickwindowagent_p.h index daafb07..c9d5680 100644 --- a/src/quick/quickwindowagent_p.h +++ b/src/quick/quickwindowagent_p.h @@ -1,15 +1,23 @@ #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 { - Q_DISABLE_COPY(QuickWindowAgentPrivate) + class QuickWindowAgentPrivate : public WindowAgentBasePrivate { Q_DECLARE_PUBLIC(QuickWindowAgent) - public: QuickWindowAgentPrivate(); ~QuickWindowAgentPrivate() override; @@ -17,9 +25,18 @@ void init(); // Host - QQuickWindow *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