mirror of
https://github.com/overte-org/overte.git
synced 2025-06-06 16:22:25 +02:00
Android - Joystick hidden when opening login and shown after Cancel.
This commit is contained in:
parent
4c3ee195de
commit
3d933e1810
3 changed files with 4 additions and 4 deletions
|
@ -38,7 +38,8 @@ ModalWindow {
|
||||||
keyboardOverride: true // Disable ModalWindow's keyboard.
|
keyboardOverride: true // Disable ModalWindow's keyboard.
|
||||||
|
|
||||||
function tryDestroy() {
|
function tryDestroy() {
|
||||||
root.destroy()
|
Controller.setVPadHidden(false);
|
||||||
|
root.destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
LoginDialog {
|
LoginDialog {
|
||||||
|
@ -54,6 +55,7 @@ ModalWindow {
|
||||||
this.anchors.centerIn = undefined;
|
this.anchors.centerIn = undefined;
|
||||||
this.y=150;
|
this.y=150;
|
||||||
this.x=(parent.width - this.width)/2;
|
this.x=(parent.width - this.width)/2;
|
||||||
|
Controller.setVPadHidden(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
Keys.onPressed: {
|
Keys.onPressed: {
|
||||||
|
|
|
@ -224,7 +224,7 @@ Item {
|
||||||
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
Qt.inputMethod.hide();
|
Qt.inputMethod.hide();
|
||||||
root.destroy();
|
root.tryDestroy();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -115,8 +115,6 @@ module.exports = {
|
||||||
qml: "hifi/avatarSelection.qml",
|
qml: "hifi/avatarSelection.qml",
|
||||||
visible: false
|
visible: false
|
||||||
});
|
});
|
||||||
/*,
|
|
||||||
visible: false*/
|
|
||||||
if (window) {
|
if (window) {
|
||||||
window.fromQml.connect(fromQml);
|
window.fromQml.connect(fromQml);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue