From 8226db0f0d7102c0d969b2b9c03f416a9e0d34d4 Mon Sep 17 00:00:00 2001 From: dogmaphobic Date: Tue, 10 Nov 2015 13:59:25 -0500 Subject: [PATCH] Reduce iOS default font size. Tweak toolbar height for mobile. --- src/QmlControls/ScreenToolsController.cc | 17 ++++++++++------- src/QmlControls/SubMenuButton.qml | 2 +- src/ui/MainWindow.qml | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/QmlControls/ScreenToolsController.cc b/src/QmlControls/ScreenToolsController.cc index 77c0bd14f..a20c8dad4 100644 --- a/src/QmlControls/ScreenToolsController.cc +++ b/src/QmlControls/ScreenToolsController.cc @@ -28,15 +28,18 @@ #include "MainWindow.h" #ifdef Q_OS_WIN -const double ScreenToolsController::_defaultFontPixelSizeRatio = 1.0; -#elif __mobile__ -const double ScreenToolsController::_defaultFontPixelSizeRatio = 1.0; +const double ScreenToolsController::_defaultFontPixelSizeRatio = 1.0; +#elif __android__ +const double ScreenToolsController::_defaultFontPixelSizeRatio = 1.0; +#elif __ios__ +const double ScreenToolsController::_defaultFontPixelSizeRatio = 0.8; #else -const double ScreenToolsController::_defaultFontPixelSizeRatio = 0.8; +const double ScreenToolsController::_defaultFontPixelSizeRatio = 0.8; #endif -const double ScreenToolsController::_smallFontPixelSizeRatio = 0.75; -const double ScreenToolsController::_mediumFontPixelSizeRatio = 1.22; -const double ScreenToolsController::_largeFontPixelSizeRatio = 1.66; + +const double ScreenToolsController::_smallFontPixelSizeRatio = 0.75; +const double ScreenToolsController::_mediumFontPixelSizeRatio = 1.22; +const double ScreenToolsController::_largeFontPixelSizeRatio = 1.66; ScreenToolsController::ScreenToolsController() { diff --git a/src/QmlControls/SubMenuButton.qml b/src/QmlControls/SubMenuButton.qml index 3b0074bf3..791362bed 100644 --- a/src/QmlControls/SubMenuButton.qml +++ b/src/QmlControls/SubMenuButton.qml @@ -39,7 +39,7 @@ Button { verticalAlignment: TextEdit.AlignVCenter horizontalAlignment: TextEdit.AlignHCenter color: showHighlight ? qgcPal.buttonHighlightText : qgcPal.buttonText - font.pixelSize: ScreenTools.isMobile ? ScreenTools.defaultFontPixelSize * 0.65 : ScreenTools.defaultFontPixelSize + font.pixelSize: ScreenTools.isMobile ? ScreenTools.defaultFontPixelSize * 0.75 : ScreenTools.defaultFontPixelSize text: control.text Rectangle { diff --git a/src/ui/MainWindow.qml b/src/ui/MainWindow.qml index a5f020236..edfc0d8ad 100644 --- a/src/ui/MainWindow.qml +++ b/src/ui/MainWindow.qml @@ -40,7 +40,7 @@ Item { QGCPalette { id: __qgcPal; colorGroupEnabled: true } - property real tbHeight: ScreenTools.isMobile ? (ScreenTools.isTinyScreen ? (mainWindow.width * 0.0666) : (mainWindow.width * 0.0444)) : ScreenTools.defaultFontPixelSize * 4 + property real tbHeight: ScreenTools.isMobile ? (ScreenTools.isTinyScreen ? (mainWindow.width * 0.0666) : (mainWindow.width * 0.05)) : ScreenTools.defaultFontPixelSize * 4 property int tbCellHeight: tbHeight * 0.75 property real tbSpacing: ScreenTools.isMobile ? width * 0.00824 : 9.54 property real tbButtonWidth: tbCellHeight * 1.3 -- 2.22.0