Mentalflow
/
framelesshelper
forked from github_mirror/framelesshelper
1
0
Fork 0
Code Pull Requests Activity

fix build on qt5 

Task-number: #210

Signed-off-by: Yuhang Zhao <zhaoyuhang@rankyee.com>
This commit is contained in:
Yuhang Zhao 2023-03-30 11:47:34 +08:00
parent 5ade3cfb74
commit 9e208bb77c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/utils.cpp
View File

@ -480,11 +480,11 @@ QPoint Utils::toNativeGlobalPosition(const QWindow *window, const QPoint &point)
if (!window) { if (!window) {
return {}; return {};
} }
#ifdef FRAMELESSHELPER_CORE_NO_PRIVATE #if (defined(FRAMELESSHELPER_CORE_NO_PRIVATE) || (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)))
return toNativePixels(window, point); return toNativePixels(window, point);
#else // !FRAMELESSHELPER_CORE_NO_PRIVATE #else // !FRAMELESSHELPER_CORE_NO_PRIVATE && QT_VERSION >= 6.0.0
return QHighDpi::toNativeGlobalPosition(point, window); return QHighDpi::toNativeGlobalPosition(point, window);
#endif // FRAMELESSHELPER_CORE_NO_PRIVATE #endif // FRAMELESSHELPER_CORE_NO_PRIVATE || QT_VERSION < 6.0.0
} }
QPoint Utils::fromNativeLocalPosition(const QWindow *window, const QPoint &point) QPoint Utils::fromNativeLocalPosition(const QWindow *window, const QPoint &point)
@ -506,11 +506,11 @@ QPoint Utils::fromNativeGlobalPosition(const QWindow *window, const QPoint &poin
if (!window) { if (!window) {
return {}; return {};
} }
#ifdef FRAMELESSHELPER_CORE_NO_PRIVATE #if (defined(FRAMELESSHELPER_CORE_NO_PRIVATE) || (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)))
return fromNativePixels(window, point); return fromNativePixels(window, point);
#else // !FRAMELESSHELPER_CORE_NO_PRIVATE #else // !FRAMELESSHELPER_CORE_NO_PRIVATE && QT_VERSION >= 6.0.0
return QHighDpi::fromNativeGlobalPosition(point, window); return QHighDpi::fromNativeGlobalPosition(point, window);
#endif // FRAMELESSHELPER_CORE_NO_PRIVATE #endif // FRAMELESSHELPER_CORE_NO_PRIVATE || QT_VERSION < 6.0.0
} }
int Utils::horizontalAdvance(const QFontMetrics &fm, const QString &str) int Utils::horizontalAdvance(const QFontMetrics &fm, const QString &str)