Browse Source

Merge pull request #6748 from DonLakeFlyer/VirtualKeyboard

Work around android Qt bug where wrong virtual keyboard is displayed
QGC4.4
Don Gagne 7 years ago committed by GitHub
parent
commit
1cd9d7aaa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      src/FactSystem/FactControls/FactValueSlider.qml
  2. 3
      src/QmlControls/ParameterEditorDialog.qml

3
src/FactSystem/FactControls/FactValueSlider.qml

@ -71,7 +71,8 @@ Rectangle { @@ -71,7 +71,8 @@ Rectangle {
id: editDialogComponent
ParameterEditorDialog {
fact: _fact
fact: _fact
setFocus: ScreenTools.isMobile ? false : true // Works around strange android bug where wrong virtual keyboard is displayed
}
}

3
src/QmlControls/ParameterEditorDialog.qml

@ -27,6 +27,7 @@ QGCViewDialog { @@ -27,6 +27,7 @@ QGCViewDialog {
property bool showRCToParam: false
property bool validate: false
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
@ -122,7 +123,7 @@ QGCViewDialog { @@ -122,7 +123,7 @@ QGCViewDialog {
unitsLabel: fact.units
showUnits: fact.units != ""
Layout.fillWidth: true
focus: true
focus: setFocus
inputMethodHints: (fact.typeIsString || ScreenTools.isiOS) ?
Qt.ImhNone : // iOS numeric keyboard has no done button, we can't use it
Qt.ImhFormattedNumbersOnly // Forces use of virtual numeric keyboard

Loading…
Cancel
Save