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 | 26 ++++++--------------------
1 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/src/core/windowagentbase.cpp b/src/core/windowagentbase.cpp
index 28c9945..0131a60 100644
--- a/src/core/windowagentbase.cpp
+++ b/src/core/windowagentbase.cpp
@@ -5,9 +5,9 @@
#include "qwkglobal_p.h"
-#if defined(Q_OS_WINDOWS) && !QWINDOWKIT_CONFIG(FORCE_QT_WINDOW_CONTEXT)
+#if defined(Q_OS_WINDOWS) && !QWINDOWKIT_CONFIG(ENABLE_QT_WINDOW_CONTEXT)
# include "win32windowcontext_p.h"
-#elif defined(Q_OS_MAC) && !QWINDOWKIT_CONFIG(FORCE_QT_WINDOW_CONTEXT)
+#elif defined(Q_OS_MAC) && !QWINDOWKIT_CONFIG(ENABLE_QT_WINDOW_CONTEXT)
# include "cocoawindowcontext_p.h"
#else
# include "qtwindowcontext_p.h"
@@ -33,9 +33,9 @@
return windowContextFactoryMethod();
}
-#if defined(Q_OS_WINDOWS) && !QWINDOWKIT_CONFIG(FORCE_QT_WINDOW_CONTEXT)
+#if defined(Q_OS_WINDOWS) && !QWINDOWKIT_CONFIG(ENABLE_QT_WINDOW_CONTEXT)
return new Win32WindowContext();
-#elif defined(Q_OS_MAC) && !QWINDOWKIT_CONFIG(FORCE_QT_WINDOW_CONTEXT)
+#elif defined(Q_OS_MAC) && !QWINDOWKIT_CONFIG(ENABLE_QT_WINDOW_CONTEXT)
return new CocoaWindowContext();
#else
return new QtWindowContext();
@@ -55,23 +55,9 @@
return d->context->windowAttribute(key);
}
- void WindowAgentBase::setWindowAttribute(const QString &key, const QVariant &var) {
+ bool WindowAgentBase::setWindowAttribute(const QString &key, const QVariant &attribute) {
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);
+ return d->context->setWindowAttribute(key, attribute);
}
void WindowAgentBase::showSystemMenu(const QPoint &pos) {
--
Gitblit v1.9.1