From adb46e1e151b73e56a7e0066a896b48b92a7230e Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周五, 22 12月 2023 21:44:10 +0800
Subject: [PATCH] win: use modern API
---
src/widgets/widgetwindowagent_p.h | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/widgets/widgetwindowagent_p.h b/src/widgets/widgetwindowagent_p.h
index eb1d96d..ac4d653 100644
--- a/src/widgets/widgetwindowagent_p.h
+++ b/src/widgets/widgetwindowagent_p.h
@@ -1,15 +1,22 @@
#ifndef WIDGETWINDOWAGENTPRIVATE_H
#define WIDGETWINDOWAGENTPRIVATE_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/private/windowagentbase_p.h>
#include <QWKWidgets/widgetwindowagent.h>
namespace QWK {
- class WidgetWindowAgentPrivate : public CoreWindowAgentPrivate {
- Q_DISABLE_COPY(WidgetWindowAgentPrivate)
+ class WidgetWindowAgentPrivate : public WindowAgentBasePrivate {
Q_DECLARE_PUBLIC(WidgetWindowAgent)
-
public:
WidgetWindowAgentPrivate();
~WidgetWindowAgentPrivate();
@@ -17,9 +24,17 @@
void init();
// Host
- QWidget *host{};
+ QWidget *hostWidget{};
+#ifdef Q_OS_MAC
+ QWidget *systemButtonAreaWidget{};
+ std::unique_ptr<QObject> systemButtonAreaWidgetEventFilter;
+#endif
+
+#ifdef Q_OS_WINDOWS
+ void setupWindows10BorderWorkaround();
+#endif
};
}
-#endif // WIDGETWINDOWAGENTPRIVATE_H
\ No newline at end of file
+#endif // WIDGETWINDOWAGENTPRIVATE_H
--
Gitblit v1.9.1