diff options
| author | Paul Olav Tvete <paul.tvete@digia.com> | 2013-09-04 14:52:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-12 07:09:42 +0200 |
| commit | ffa4de4bec01335eb63016f0e89b568fb7416ea8 (patch) | |
| tree | 8e2c5af5a367dbd27af80467f5c62d0823f7c1e7 /src | |
| parent | cfbc575b61364426dc67ac66d482b9088198c0be (diff) | |
Android: Make font size compatible with Qt for iOS
We recommend using pixel sizes for predictable results. For those who
use point sizes in their UIs, we will now give them results that look
similar to what we do on iOS. The default font is changed to give
the same size as before this change.
Task-number: QTBUG-32096
Change-Id: Ia25506ba721a39d31340f3df8bc14129e507af14
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'src')
3 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp b/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp index c6e3035476..0c26aadc53 100644 --- a/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp +++ b/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp @@ -90,7 +90,7 @@ QSizeF QEglFSAndroidHooks::physicalScreenSize() const QDpi QEglFSAndroidHooks::logicalDpi() const { - qreal lDpi = QtAndroid::scaledDensity() * 100; + qreal lDpi = QtAndroid::scaledDensity() * 72; return QDpi(lDpi, lDpi); } diff --git a/src/plugins/platforms/android/src/qandroidplatformtheme.cpp b/src/plugins/platforms/android/src/qandroidplatformtheme.cpp index 9e08440eed..79fbc440fc 100644 --- a/src/plugins/platforms/android/src/qandroidplatformtheme.cpp +++ b/src/plugins/platforms/android/src/qandroidplatformtheme.cpp @@ -122,6 +122,11 @@ const QFont *QAndroidPlatformTheme::font(Font type) const QHash<int, QFont>::const_iterator it = m_androidPlatformNativeInterface->m_fonts.find(fontType(type)); if (it != m_androidPlatformNativeInterface->m_fonts.end()) return &(it.value()); + + // default in case the style has not set a font + static QFont systemFont("Roboto", 12.0 * 100 / 72); // keep default size the same after changing from 100 dpi to 72 dpi + if (type == QPlatformTheme::SystemFont) + return &systemFont; return 0; } diff --git a/src/plugins/platforms/android/src/raster/qandroidplatformscreen.cpp b/src/plugins/platforms/android/src/raster/qandroidplatformscreen.cpp index 409c833db3..cf24d68ab5 100644 --- a/src/plugins/platforms/android/src/raster/qandroidplatformscreen.cpp +++ b/src/plugins/platforms/android/src/raster/qandroidplatformscreen.cpp @@ -72,6 +72,6 @@ QRegion QAndroidPlatformScreen::doRedraw() QDpi QAndroidPlatformScreen::logicalDpi() const { - qreal lDpi = QtAndroid::scaledDensity() * 100; + qreal lDpi = QtAndroid::scaledDensity() * 72; return QDpi(lDpi, lDpi); } |