Unverified Commit 1cd9d7aa authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #6748 from DonLakeFlyer/VirtualKeyboard

Work around android Qt bug where wrong virtual keyboard is displayed
parents f4ccb45f 97c80463
...@@ -71,7 +71,8 @@ Rectangle { ...@@ -71,7 +71,8 @@ Rectangle {
id: editDialogComponent id: editDialogComponent
ParameterEditorDialog { ParameterEditorDialog {
fact: _fact fact: _fact
setFocus: ScreenTools.isMobile ? false : true // Works around strange android bug where wrong virtual keyboard is displayed
} }
} }
......
...@@ -27,6 +27,7 @@ QGCViewDialog { ...@@ -27,6 +27,7 @@ QGCViewDialog {
property bool showRCToParam: false property bool showRCToParam: false
property bool validate: false property bool validate: false
property string validateValue property string validateValue
property bool setFocus: true ///< true: focus is set to text field on display, false: focus not set (works around strange virtual keyboard bug with FactValueSlider
signal valueChanged signal valueChanged
...@@ -122,7 +123,7 @@ QGCViewDialog { ...@@ -122,7 +123,7 @@ QGCViewDialog {
unitsLabel: fact.units unitsLabel: fact.units
showUnits: fact.units != "" showUnits: fact.units != ""
Layout.fillWidth: true Layout.fillWidth: true
focus: true focus: setFocus
inputMethodHints: (fact.typeIsString || ScreenTools.isiOS) ? inputMethodHints: (fact.typeIsString || ScreenTools.isiOS) ?
Qt.ImhNone : // iOS numeric keyboard has no done button, we can't use it Qt.ImhNone : // iOS numeric keyboard has no done button, we can't use it
Qt.ImhFormattedNumbersOnly // Forces use of virtual numeric keyboard Qt.ImhFormattedNumbersOnly // Forces use of virtual numeric keyboard
......
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