Merge pull request #13957 from ElderOrb/FB18024

fix keyboard collapsing in VR/goto
This commit is contained in:
John Conklin II 2018-09-10 13:09:28 -07:00 committed by GitHub
commit 9c546fc780
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -105,7 +105,6 @@ StackView {
propagateComposedEvents: true propagateComposedEvents: true
onPressed: { onPressed: {
parent.forceActiveFocus(); parent.forceActiveFocus();
addressBarDialog.keyboardEnabled = false;
mouse.accepted = false; mouse.accepted = false;
} }
} }
@ -223,7 +222,6 @@ StackView {
updateLocationText(text.length > 0); updateLocationText(text.length > 0);
} }
onAccepted: { onAccepted: {
addressBarDialog.keyboardEnabled = false;
toggleOrGo(); toggleOrGo();
} }
@ -378,7 +376,7 @@ StackView {
HifiControls.Keyboard { HifiControls.Keyboard {
id: keyboard id: keyboard
raised: parent.keyboardEnabled raised: parent.keyboardEnabled && parent.keyboardRaised
numeric: parent.punctuationMode numeric: parent.punctuationMode
anchors { anchors {
bottom: parent.bottom bottom: parent.bottom