Commit 85379ce3 authored by Don Gagne's avatar Don Gagne

Merge pull request #1978 from DonLakeFlyer/VirtualKeyboard

Mobile virtual keyboard fixes, plus font
parents 8cca90f9 7f834f5b
......@@ -14,8 +14,11 @@ QGCTextField {
property Fact fact: null
property string _validateString
text: fact.valueString
unitsLabel: fact.units
text: fact.valueString
unitsLabel: fact.units
// At this point all Facts are numeric
inputMethodHints: Qt.ImhFormattedNumbersOnly
onEditingFinished: {
if (qgcView) {
......
......@@ -84,6 +84,9 @@ QGCViewDialog {
id: valueField
text: validate ? validateValue : fact.valueString
// At this point all Facts are numeric
inputMethodHints: Qt.ImhFormattedNumbersOnly
onAccepted: accept()
Keys.onReleased: {
......
......@@ -39,10 +39,12 @@ FactPanel {
signal hideDialog
function accept() {
Qt.inputMethod.hide()
hideDialog()
}
function reject() {
Qt.inputMethod.hide()
hideDialog()
}
......
......@@ -15,8 +15,8 @@ Item {
// On OSX ElCapitan with Qt 5.4.0 any font pixel size above 19 shows garbage test. No idea why at this point.
// Will remove Math.min when problem is figure out.
readonly property real mediumFontPixelSize: Math.min(defaultFontPixelSize * ScreenToolsController.mediumFontPixelSizeRatio, 19)
readonly property real largeFontPixelSize: Math.min(defaultFontPixelSize * ScreenToolsController.largeFontPixelSizeRatio, 19)
readonly property real mediumFontPixelSize: Math.min(defaultFontPixelSize * ScreenToolsController.mediumFontPixelSizeRatio, ScreenToolsController.isMobile ? 10000 : 19)
readonly property real largeFontPixelSize: Math.min(defaultFontPixelSize * ScreenToolsController.largeFontPixelSizeRatio, ScreenToolsController.isMobile ? 10000 : 19)
property bool isAndroid: ScreenToolsController.isAndroid
property bool isiOS: ScreenToolsController.isiOS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment