Skip to content

Q
qgroundcontrol
Unverified Commit b2371899 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #8824 from DonLakeFlyer/InputMethod 

Fix location of Qt.inputMethod.hide()
parents 2fb34f4c 46b4e578
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
src/QmlControls/QGCViewDialog.qml
View file @ b2371899
...@@ -32,14 +32,12 @@ Item { ...@@ -32,14 +32,12 @@ Item {
function accept() { function accept() {
if (acceptAllowed) { if (acceptAllowed) {
Qt.inputMethod.hide()
hideDialog() hideDialog()
} }
} }
function reject() { function reject() {
if (rejectAllowed) { if (rejectAllowed) {
Qt.inputMethod.hide()
hideDialog() hideDialog()
} }
} }
......
src/QmlControls/QGCViewDialogContainer.qml
View file @ b2371899
...@@ -86,6 +86,7 @@ Item { ...@@ -86,6 +86,7 @@ Item {
Connections { Connections {
target: _dialogComponentLoader.item target: _dialogComponentLoader.item
onHideDialog: { onHideDialog: {
Qt.inputMethod.hide()
mainWindowDialog.close() mainWindowDialog.close()
} }
} }
......
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