peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qskGlobalScalefactor added

Browse Source
This commit is contained in:
Uwe Rathmann 2021-04-21 08:26:15 +02:00
parent 0461029ea9
commit 63619f68d4
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/common/QskFunctions.cpp
View File

@ -8,6 +8,15 @@
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#include <private/qguiapplication_p.h> #include <private/qguiapplication_p.h>
#if QT_VERSION < QT_VERSION_CHECK( 5, 8, 0 )
#ifndef foreach
// qhighdpiscaling_p.h needs it
#define foreach Q_FOREACH
#endif
#endif
#include <private/qhighdpiscaling_p.h>
QSK_QT_PRIVATE_END QSK_QT_PRIVATE_END
#include <qpa/qplatformintegration.h> #include <qpa/qplatformintegration.h>
@ -162,6 +171,13 @@ qreal qskHorizontalAdvance( const QFontMetricsF& fontMetrics, const QString& tex
#endif #endif
} }
qreal qskGlobalScaleFactor()
{
// The value of QT_SCALE_FACTOR
const QScreen* noScreen = nullptr;
return QHighDpiScaling::factor( noScreen );
}
bool qskHasPlatformWindowManagement() bool qskHasPlatformWindowManagement()
{ {
if ( auto platform = QGuiApplicationPrivate::platformIntegration() ) if ( auto platform = QGuiApplicationPrivate::platformIntegration() )
@ -177,20 +193,3 @@ QRect qskPlatformScreenGeometry( const QScreen* screen )
return screen->handle()->geometry(); return screen->handle()->geometry();
} }
#if 0
// does not compile with Qt 5.6 TODO ...
QSK_QT_PRIVATE_BEGIN
#include <private/qhighdpiscaling_p.h>
QSK_QT_PRIVATE_END
qreal qskGlobalScaleFactor()
{
// The value of QT_SCALE_FACTOR
const QScreen* noScreen = nullptr;
return QHighDpiScaling::factor( noScreen );
}
#endif

1
src/common/QskFunctions.h
View File

@ -17,6 +17,7 @@ class QFontMetricsF;
class QString; class QString;
QSK_EXPORT qreal qskDpiScaled( qreal value ); QSK_EXPORT qreal qskDpiScaled( qreal value );
QSK_EXPORT qreal qskGlobalScaleFactor();
QSK_EXPORT bool qskHasPlatformWindowManagement(); QSK_EXPORT bool qskHasPlatformWindowManagement();
QSK_EXPORT QRect qskPlatformScreenGeometry( const QScreen* ); QSK_EXPORT QRect qskPlatformScreenGeometry( const QScreen* );