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_p.h | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/src/core/qwkglobal_p.h b/src/core/qwkglobal_p.h
index 1a1f626..57b499f 100644
--- a/src/core/qwkglobal_p.h
+++ b/src/core/qwkglobal_p.h
@@ -1,9 +1,24 @@
+// 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_P_H
#define QWKGLOBAL_P_H
-#include <QtCore/QLoggingCategory>
+//
+// W A R N I N G !!!
+// -----------------
+//
+// This file is not part of the QWindowKit API. It is used purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or may even be removed.
+//
-#include <QWKCore/qwkcoreglobal.h>
+#include <QtCore/QObject>
+#include <QtCore/QLoggingCategory>
+#include <QtGui/QMouseEvent>
+
+#include <QWKCore/qwkglobal.h>
QWK_CORE_EXPORT Q_DECLARE_LOGGING_CATEGORY(qWindowKitLog)
@@ -15,4 +30,42 @@
# define QWK_FATAL qCFatal(qWindowKitLog)
#endif
+#define MAKE_RGB_COLOR(r, g, b) ((quint32) (((r) &0xFF) << 16) | (((g) &0xFF) << 8) | ((b) &0xFF))
+
+#define MAKE_RGBA_COLOR(r, g, b, a) \
+ ((quint32) (((a) &0xFF) << 24) | (((r) &0xFF) << 16) | (((g) &0xFF) << 8) | ((b) &0xFF))
+
+#if defined(Q_CC_MSVC)
+# define QWK_NOINLINE __declspec(noinline)
+# define QWK_INLINE __forceinline
+# define QWK_USED
+#else
+# define QWK_NOINLINE __attribute__((noinline))
+# define QWK_INLINE __attribute__((always_inline))
+# define QWK_USED __attribute__((used))
+#endif
+
+namespace QWK {
+
+ inline QPoint getMouseEventScenePos(const QMouseEvent *event) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ return event->scenePosition().toPoint();
+#else
+ return event->windowPos().toPoint();
+#endif
+ }
+
+ inline QPoint getMouseEventGlobalPos(const QMouseEvent *event) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ return event->globalPosition().toPoint();
+#else
+ return event->screenPos().toPoint();
+#endif
+ }
+
+ // Be careful when apply this function to a widget
+ QWK_CORE_EXPORT bool forwardObjectEventFilters(QObject *currentFilter, QObject *receiver,
+ QEvent *event);
+}
+
#endif // QWKGLOBAL_P_H
--
Gitblit v1.9.1