From 9dcea027f16c4ce5852da3dfc8aca284c582bd7d Mon Sep 17 00:00:00 2001
From: sola.lu <sola.lu.greentest.com.cn>
Date: 周五, 06 6月 2025 18:19:18 +0800
Subject: [PATCH] 1.注释掉custom margin，解决程序放大后，遮盖窗口底部内容的问题。
---
src/core/qwkglobal.h | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/core/qwkglobal.h b/src/core/qwkglobal.h
index fb15d4f..3e98112 100644
--- a/src/core/qwkglobal.h
+++ b/src/core/qwkglobal.h
@@ -1,9 +1,26 @@
+// Copyright (C) 2023-2024 Stdware Collections (https://www.github.com/stdware)
+// Copyright (C) 2021-2023 wangwenx190 (Yuhang Zhao)
+// SPDX-License-Identifier: Apache-2.0
+
#ifndef QWKGLOBAL_H
#define QWKGLOBAL_H
-#include <QtCore/QEvent>
+#include <functional>
-#include <QWKCore/qwkcoreglobal.h>
+#include <QtCore/QEvent>
+#include <QtGui/QtEvents>
+
+#ifndef QWK_CORE_EXPORT
+# ifdef QWK_CORE_STATIC
+# define QWK_CORE_EXPORT
+# else
+# ifdef QWK_CORE_LIBRARY
+# define QWK_CORE_EXPORT Q_DECL_EXPORT
+# else
+# define QWK_CORE_EXPORT Q_DECL_IMPORT
+# endif
+# endif
+#endif
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
using QT_NATIVE_EVENT_RESULT_TYPE = qintptr;
@@ -13,4 +30,21 @@
using QT_ENTER_EVENT_TYPE = QEvent;
#endif
+#ifndef QWINDOWKIT_CONFIG
+# define QWINDOWKIT_CONFIG(feature) ((1 / QWINDOWKIT_##feature) == 1)
+#endif
+
+#if defined(__GNUC__) || defined(__clang__)
+# define QWINDOWKIT_PRINTF_FORMAT(fmtpos, attrpos) \
+ __attribute__((__format__(__printf__, fmtpos, attrpos)))
+#else
+# define QWINDOWKIT_PRINTF_FORMAT(fmtpos, attrpos)
+#endif
+
+namespace QWK {
+
+ using ScreenRectCallback = std::function<QRect(const QSize &)>;
+
+}
+
#endif // QWKGLOBAL_H
--
Gitblit v1.9.1