From aa4bda0cc081e0703d258ddb4e025b2a47be3203 Mon Sep 17 00:00:00 2001 From: SeeLook <seelook@gmail.com> Date: Fri, 12 Feb 2021 17:32:25 +0100 Subject: [PATCH] [Android] Increase defaule font size but set it globally - calculate bigger factor from screen density - but force to use such a pixel size for entire app --- src/libs/core/tnootkaqml.cpp | 2 +- src/main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/core/tnootkaqml.cpp b/src/libs/core/tnootkaqml.cpp index b82293e6d..2a963394b 100755 --- a/src/libs/core/tnootkaqml.cpp +++ b/src/libs/core/tnootkaqml.cpp @@ -354,7 +354,7 @@ qreal TnootkaQML::lightness(const QColor& c) const { int TnootkaQML::factor() { #if defined (Q_OS_ANDROID) // Set Android font according to screen size/density - return qRound(Tmtr::fingerPixels() * 0.3 * GLOB->guiScale()); + return qRound(Tmtr::fingerPixels() * 0.35 * GLOB->guiScale()); #else // but use system font size on desktops return qRound(Tmtr::systemFont.pointSize() / 72.0 * qApp->primaryScreen()->logicalDotsPerInch() * GLOB->guiScale()); diff --git a/src/main.cpp b/src/main.cpp index 14817f802..359546eed 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -144,7 +144,7 @@ int main(int argc, char *argv[]) auto f = a->font(); #if defined (Q_OS_ANDROID) - f.setPixelSize(qRound(static_cast<qreal>(f.pixelSize()) * gl->guiScale())); + f.setPixelSize(nooObj->factor()); auto pal = qApp->palette(); pal.setColor(QPalette::Active, QPalette::Highlight, QColor(0, 160, 160)); // Teal color of highlight for Android pal.setColor(QPalette::Active, QPalette::Shadow, QColor(120, 120, 120)); // Dark gray for shadow -- GitLab