From c29c4cc40922102b6d460270687532377c188e79 Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Mon, 28 Jun 2021 11:08:12 +0800 Subject: [PATCH] Minor tweaks Signed-off-by: Yuhang Zhao <2546789017@qq.com> --- framelesswindowsmanager.cpp | 6 ++---- utilities.cpp | 7 +++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/framelesswindowsmanager.cpp b/framelesswindowsmanager.cpp index acdbe27..ce44dd5 100644 --- a/framelesswindowsmanager.cpp +++ b/framelesswindowsmanager.cpp @@ -38,8 +38,6 @@ Q_GLOBAL_STATIC(FramelessHelper, framelessHelperUnix) #endif -Q_DECLARE_METATYPE(const QObject *) - void FramelessWindowsManager::addWindow(QWindow *window) { Q_ASSERT(window); @@ -132,11 +130,11 @@ int FramelessWindowsManager::getTitleBarHeight(const QWindow *window) { Q_ASSERT(window); if (!window) { - return 30; + return 31; } #ifdef FRAMELESSHELPER_USE_UNIX_VERSION const int value = window->property(_flh_global::_flh_titleBarHeight_flag).toInt(); - return value <= 0 ? 30 : value; + return value <= 0 ? 31 : value; #else return Utilities::getSystemMetric(window, Utilities::SystemMetric::TitleBarHeight, false); #endif diff --git a/utilities.cpp b/utilities.cpp index 87e19fb..6cc2c85 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -26,8 +26,7 @@ #include #include #include - -Q_DECLARE_METATYPE(const QObject *) +#include QWindow *Utilities::findWindow(const WId winId) { @@ -73,9 +72,9 @@ bool Utilities::isWindowFixedSize(const QWindow *window) QPointF Utilities::getGlobalMousePosition(const QWindow *window) { if (window) { - return QPointF(QCursor::pos(window->screen()) * window->devicePixelRatio()); + return QPointF(QCursor::pos(window->screen())) * window->devicePixelRatio(); } else { - return QPointF(QCursor::pos() * qGuiApp->devicePixelRatio()); + return QPointF(QCursor::pos()) * QGuiApplication::primaryScreen()->devicePixelRatio(); } }