From 2d5b2dbbbe0ac478964db5c49f49e618d8a5b429 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Mon, 6 Jun 2016 10:57:29 -0700 Subject: [PATCH] iOS uses 12 point for all devices --- src/QmlControls/ScreenTools.qml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/QmlControls/ScreenTools.qml b/src/QmlControls/ScreenTools.qml index 41a76e6d5..77d2dfd10 100644 --- a/src/QmlControls/ScreenTools.qml +++ b/src/QmlControls/ScreenTools.qml @@ -84,20 +84,20 @@ Item { //-- Init base size base on the platform if(ScreenToolsController.isMobile) { //-- Check iOS really tiny screens (iPhone 4s/5/5s) - if(ScreenToolsController.isiOS && Screen.width < 570) - baseSize = 9; - //-- iPhone 6/6s) - else if(ScreenToolsController.isiOS && Screen.width < 670) - baseSize = 10; - // Larger iOS (6/6s Plus or iPad) - else if(ScreenToolsController.isiOS) - baseSize = 13; - // Small Android Devices - else if((Screen.width / Screen.pixelDensity) < 120) + if(ScreenToolsController.isiOS) { + if(ScreenToolsController.isiOS && Screen.width < 570) { + // For iPhone 4s size we don't fit with additional tweaks to fit screen, + // we will just drop point size to make things fit. Correct size not yet determined. + baseSize = 12; // This will be lowered in a future pull + } else { + baseSize = 12; + } + } else if((Screen.width / Screen.pixelDensity) < 120) { baseSize = 11; // Other Android - else + } else { baseSize = 14; + } } else { //-- Mac OS if(ScreenToolsController.isMacOS) -- 2.22.0