From c837319767bb609c6ec806336e49a347c77b11d3 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周五, 22 12月 2023 21:30:53 +0800
Subject: [PATCH] Add non-system-border option on Windows
---
src/core/windowagentbase.cpp | 71 +++++++++++++++++------------------
1 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/src/core/windowagentbase.cpp b/src/core/windowagentbase.cpp
index 94d1fca..0131a60 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(ENABLE_QT_WINDOW_CONTEXT)
# include "win32windowcontext_p.h"
+#elif defined(Q_OS_MAC) && !QWINDOWKIT_CONFIG(ENABLE_QT_WINDOW_CONTEXT)
+# include "cocoawindowcontext_p.h"
#else
# include "qtwindowcontext_p.h"
#endif
@@ -12,6 +16,9 @@
Q_LOGGING_CATEGORY(qWindowKitLog, "qwindowkit")
namespace QWK {
+
+ WindowAgentBasePrivate::WindowContextFactoryMethod
+ WindowAgentBasePrivate::windowContextFactoryMethod = nullptr;
WindowAgentBasePrivate::WindowAgentBasePrivate() : q_ptr(nullptr), context(nullptr) {
}
@@ -22,58 +29,50 @@
}
AbstractWindowContext *WindowAgentBasePrivate::createContext() const {
- return
-#ifdef Q_OS_WINDOWS
- new Win32WindowContext()
+ if (windowContextFactoryMethod) {
+ return windowContextFactoryMethod();
+ }
+
+#if defined(Q_OS_WINDOWS) && !QWINDOWKIT_CONFIG(ENABLE_QT_WINDOW_CONTEXT)
+ return new Win32WindowContext();
+#elif defined(Q_OS_MAC) && !QWINDOWKIT_CONFIG(ENABLE_QT_WINDOW_CONTEXT)
+ return new CocoaWindowContext();
#else
- new QtWindowContext()
+ 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);
+ }
+
+ bool WindowAgentBase::setWindowAttribute(const QString &key, const QVariant &attribute) {
+ Q_D(WindowAgentBase);
+ return d->context->setWindowAttribute(key, attribute);
+ }
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