From 3871bfc5d3aff45e498fa2944c27e6eb5d146c8e Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周三, 20 12月 2023 19:56:32 +0800
Subject: [PATCH] Add mac hot-switch implementations
---
src/core/windowagentbase.cpp | 71 +++++++++++++++++++----------------
1 files changed, 38 insertions(+), 33 deletions(-)
diff --git a/src/core/windowagentbase.cpp b/src/core/windowagentbase.cpp
index a796b3e..28c9945 100644
--- a/src/core/windowagentbase.cpp
+++ b/src/core/windowagentbase.cpp
@@ -1,11 +1,13 @@
#include "windowagentbase.h"
#include "windowagentbase_p.h"
+#include <QWKCore/qwkconfig.h>
+
#include "qwkglobal_p.h"
-#if defined(Q_OS_WINDOWS) && !defined(QWINDOWKIT_FORCE_QT_WINDOW_CONTEXT)
+#if defined(Q_OS_WINDOWS) && !QWINDOWKIT_CONFIG(FORCE_QT_WINDOW_CONTEXT)
# include "win32windowcontext_p.h"
-#elif defined(Q_OS_MAC) && !defined(QWINDOWKIT_FORCE_QT_WINDOW_CONTEXT)
+#elif defined(Q_OS_MAC) && !QWINDOWKIT_CONFIG(FORCE_QT_WINDOW_CONTEXT)
# include "cocoawindowcontext_p.h"
#else
# include "qtwindowcontext_p.h"
@@ -31,57 +33,60 @@
return windowContextFactoryMethod();
}
-#if defined(Q_OS_WINDOWS) && !defined(QWINDOWKIT_FORCE_QT_WINDOW_CONTEXT)
+#if defined(Q_OS_WINDOWS) && !QWINDOWKIT_CONFIG(FORCE_QT_WINDOW_CONTEXT)
return new Win32WindowContext();
-#elif defined(Q_OS_MAC) && !defined(QWINDOWKIT_FORCE_QT_WINDOW_CONTEXT)
+#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;
+
+ QVariant WindowAgentBase::windowAttribute(const QString &key) const {
+ Q_D(const WindowAgentBase);
+ return d->context->windowAttribute(key);
+ }
+
+ void WindowAgentBase::setWindowAttribute(const QString &key, const QVariant &var) {
+ Q_D(WindowAgentBase);
+ d->context->setWindowAttribute(key, var);
+ }
+
+ bool WindowAgentBase::isEnabled() const {
+ Q_D(const WindowAgentBase);
+ return d->context->isEnabled();
+ }
+
+ void WindowAgentBase::setEnabled(bool enabled) {
+ Q_D(WindowAgentBase);
+ if (enabled == d->context->isEnabled()) {
+ return;
+ }
+ d->context->setEnabled(enabled);
+ Q_EMIT enabledChanged(enabled);
+ }
void WindowAgentBase::showSystemMenu(const QPoint &pos) {
Q_D(WindowAgentBase);
d->context->showSystemMenu(pos);
}
- void WindowAgentBase::startSystemMove(const QPoint &pos) {
- Q_D(WindowAgentBase);
- auto win = d->context->window();
- if (!win) {
- return;
- }
-
- Q_UNUSED(pos)
- win->startSystemMove();
- }
-
- void WindowAgentBase::startSystemResize(Qt::Edges edges, const QPoint &pos) {
- Q_D(WindowAgentBase);
- auto win = d->context->window();
- if (!win) {
- return;
- }
-
- Q_UNUSED(pos)
- win->startSystemResize(edges);
- }
-
void WindowAgentBase::centralize() {
+ Q_D(WindowAgentBase);
+ d->context->virtual_hook(AbstractWindowContext::CentralizeHook, nullptr);
}
void WindowAgentBase::raise() {
+ Q_D(WindowAgentBase);
+ d->context->virtual_hook(AbstractWindowContext::RaiseWindowHook, nullptr);
}
WindowAgentBase::WindowAgentBase(WindowAgentBasePrivate &d, QObject *parent)
--
Gitblit v1.9.1