From 718590bf4dec0e8d9e7a75af98568f5eff5f8f9d Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 19 12月 2023 14:45:36 +0800
Subject: [PATCH] Remove stylesupport
---
src/core/windowagentbase.cpp | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/core/windowagentbase.cpp b/src/core/windowagentbase.cpp
index 65b7dad..d2b9e1e 100644
--- a/src/core/windowagentbase.cpp
+++ b/src/core/windowagentbase.cpp
@@ -1,10 +1,14 @@
#include "windowagentbase.h"
#include "windowagentbase_p.h"
+#include <QWKCore/qwkconfig.h>
+
#include "qwkglobal_p.h"
-#ifdef Q_OS_WINDOWS
+#if defined(Q_OS_WINDOWS) && !QWINDOWKIT_CONFIG(FORCE_QT_WINDOW_CONTEXT)
# include "win32windowcontext_p.h"
+#elif defined(Q_OS_MAC) && !QWINDOWKIT_CONFIG(FORCE_QT_WINDOW_CONTEXT)
+# include "cocoawindowcontext_p.h"
#else
# include "qtwindowcontext_p.h"
#endif
@@ -28,20 +32,20 @@
if (windowContextFactoryMethod) {
return windowContextFactoryMethod();
}
-#ifdef Q_OS_WINDOWS
+
+#if defined(Q_OS_WINDOWS) && !QWINDOWKIT_CONFIG(FORCE_QT_WINDOW_CONTEXT)
return new Win32WindowContext();
+#elif defined(Q_OS_MAC) && !QWINDOWKIT_CONFIG(FORCE_QT_WINDOW_CONTEXT)
+ return new CocoaWindowContext();
#else
return new QtWindowContext();
#endif
}
- bool WindowAgentBasePrivate::setup(QObject *host, WindowItemDelegate *delegate) {
- std::unique_ptr<AbstractWindowContext> ctx(createContext());
- if (!ctx->setup(host, delegate)) {
- return false;
- }
- context = std::move(ctx);
- return true;
+ void WindowAgentBasePrivate::setup(QObject *host, WindowItemDelegate *delegate) {
+ auto ctx = createContext();
+ ctx->setup(host, delegate);
+ context.reset(ctx);
}
WindowAgentBase::~WindowAgentBase() = default;
--
Gitblit v1.9.1