diff --git a/src/QmlControls/QGCButton.qml b/src/QmlControls/QGCButton.qml index 3819ec9..3ffd08e 100644 --- a/src/QmlControls/QGCButton.qml +++ b/src/QmlControls/QGCButton.qml @@ -64,7 +64,7 @@ Button { background: Item { property bool down: control.pressed || (control.checkable && control.checked) implicitWidth: Math.round(TextSingleton.implicitHeight * 4.5) - implicitHeight: Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2)) + implicitHeight: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 3 * 0.75 : Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2)) Rectangle { anchors.fill: parent diff --git a/src/QmlControls/QGCCheckBox.qml b/src/QmlControls/QGCCheckBox.qml index c68d40f..25aa8ff 100644 --- a/src/QmlControls/QGCCheckBox.qml +++ b/src/QmlControls/QGCCheckBox.qml @@ -11,7 +11,7 @@ CheckBox { style: CheckBoxStyle { label: Item { implicitWidth: text.implicitWidth + 2 - implicitHeight: text.implicitHeight + implicitHeight: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 3 * 0.75 : text.implicitHeight baselineOffset: text.baselineOffset Rectangle { anchors.fill: text diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml index db8a5b9..f393b8e 100644 --- a/src/QmlControls/QGCComboBox.qml +++ b/src/QmlControls/QGCComboBox.qml @@ -18,7 +18,7 @@ ComboBox { background: Item { implicitWidth: Math.round(TextSingleton.implicitHeight * 4.5) - implicitHeight: Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2)) + implicitHeight: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 3 * 0.75 : Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2)) Rectangle { anchors.fill: parent diff --git a/src/QmlControls/QGCRadioButton.qml b/src/QmlControls/QGCRadioButton.qml index 1894bd9..86b3e35 100644 --- a/src/QmlControls/QGCRadioButton.qml +++ b/src/QmlControls/QGCRadioButton.qml @@ -11,7 +11,7 @@ RadioButton { style: RadioButtonStyle { label: Item { implicitWidth: text.implicitWidth + 2 - implicitHeight: text.implicitHeight + implicitHeight: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 3 * 0.75 : text.implicitHeight baselineOffset: text.y + text.baselineOffset Rectangle { anchors.fill: text diff --git a/src/QmlControls/QGCTextField.qml b/src/QmlControls/QGCTextField.qml index 3facce0..3d38a8e 100644 --- a/src/QmlControls/QGCTextField.qml +++ b/src/QmlControls/QGCTextField.qml @@ -12,6 +12,7 @@ TextField { property var __qgcPal: QGCPalette { colorGroupEnabled: enabled } textColor: __qgcPal.textFieldText + height: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 3 * 0.75 : implicitHeight Label { id: unitsLabelWidthGenerator