From ba62f9c6862aa2a7447fe4e077ca179f85b5b5e4 Mon Sep 17 00:00:00 2001 From: xiphon Date: Thu, 15 Apr 2021 19:00:36 +0000 Subject: main: omit QML Screen type, use QGuiApplication::primaryScreen() instead --- src/main/main.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/main.cpp') diff --git a/src/main/main.cpp b/src/main/main.cpp index 10cf5a73..e3aca5e9 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -331,7 +331,7 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw // screen settings // Mobile is designed on 128dpi qreal ref_dpi = 128; - QRect geo = QGuiApplication::primaryScreen()->availableGeometry(); + QSize screenAvailableSize = QGuiApplication::primaryScreen()->availableVirtualSize(); QRect rect = QGuiApplication::primaryScreen()->geometry(); qreal dpi = QGuiApplication::primaryScreen()->logicalDotsPerInch(); qreal physicalDpi = QGuiApplication::primaryScreen()->physicalDotsPerInch(); @@ -354,6 +354,7 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw qWarning().nospace().noquote() << "Qt:" << QT_VERSION_STR << " GUI:" << GUI_VERSION << " | screen: " << rect.width() << "x" << rect.height() + << " - available: " << screenAvailableSize << " - dpi: " << dpi << " - ratio:" << calculated_ratio; // registering types for QML @@ -464,8 +465,8 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw engine.rootContext()->setContextProperty("isOpenGL", isOpenGL); engine.rootContext()->setContextProperty("isTails", isTails); - engine.rootContext()->setContextProperty("screenWidth", geo.width()); - engine.rootContext()->setContextProperty("screenHeight", geo.height()); + engine.rootContext()->setContextProperty("screenAvailableWidth", screenAvailableSize.width()); + engine.rootContext()->setContextProperty("screenAvailableHeight", screenAvailableSize.height()); #ifndef Q_OS_IOS const QString desktopFolder = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation); -- cgit v1.2.3