Browse Source

iOS uses 12 point for all devices

QGC4.4
Don Gagne 9 years ago
parent
commit
2d5b2dbbbe
  1. 22
      src/QmlControls/ScreenTools.qml

22
src/QmlControls/ScreenTools.qml

@ -84,20 +84,20 @@ Item {
//-- Init base size base on the platform //-- Init base size base on the platform
if(ScreenToolsController.isMobile) { if(ScreenToolsController.isMobile) {
//-- Check iOS really tiny screens (iPhone 4s/5/5s) //-- Check iOS really tiny screens (iPhone 4s/5/5s)
if(ScreenToolsController.isiOS && Screen.width < 570) if(ScreenToolsController.isiOS) {
baseSize = 9; if(ScreenToolsController.isiOS && Screen.width < 570) {
//-- iPhone 6/6s) // For iPhone 4s size we don't fit with additional tweaks to fit screen,
else if(ScreenToolsController.isiOS && Screen.width < 670) // we will just drop point size to make things fit. Correct size not yet determined.
baseSize = 10; baseSize = 12; // This will be lowered in a future pull
// Larger iOS (6/6s Plus or iPad) } else {
else if(ScreenToolsController.isiOS) baseSize = 12;
baseSize = 13; }
// Small Android Devices } else if((Screen.width / Screen.pixelDensity) < 120) {
else if((Screen.width / Screen.pixelDensity) < 120)
baseSize = 11; baseSize = 11;
// Other Android // Other Android
else } else {
baseSize = 14; baseSize = 14;
}
} else { } else {
//-- Mac OS //-- Mac OS
if(ScreenToolsController.isMacOS) if(ScreenToolsController.isMacOS)

Loading…
Cancel
Save