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/core/windowagentbase.cpp | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/core/windowagentbase.cpp b/src/core/windowagentbase.cpp
index 72b1229..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();
@@ -50,6 +50,16 @@
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);
--
Gitblit v1.9.1