Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 05:17:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding tablet close upon login

Browse source
This commit is contained in:
Wayne Chen 2019-01-15 10:02:00 -08:00
parent 2d16e71e74
commit 5c54930910
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/LoginDialog/LoggingInBody.qml
View file

@ -279,7 +279,6 @@ Item {
"withOculus": loggingInBody.withOculus, "errorString": errorString }); "withOculus": loggingInBody.withOculus, "errorString": errorString });
} else if (loggingInBody.withOculus) { } else if (loggingInBody.withOculus) {
errorString = "Your Oculus authentication has failed. Please make sure you are logged into Oculus and try again." errorString = "Your Oculus authentication has failed. Please make sure you are logged into Oculus and try again."
console.log("loggingInBody- withOculus: " + loggingInBody.withOculus);
bodyLoader.setSource("CompleteProfileBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": loggingInBody.withSteam, bodyLoader.setSource("CompleteProfileBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": loggingInBody.withSteam,
"withOculus": loggingInBody.withOculus, "errorString": errorString }); "withOculus": loggingInBody.withOculus, "errorString": errorString });
} else { } else {

12
interface/resources/qml/dialogs/TabletLoginDialog.qml
View file

@ -14,6 +14,8 @@ import QtQuick 2.5
import controlsUit 1.0 as HifiControlsUit import controlsUit 1.0 as HifiControlsUit
import stylesUit 1.0 as HifiStylesUit import stylesUit 1.0 as HifiStylesUit
import TabletScriptingInterface 1.0
import "../LoginDialog" import "../LoginDialog"
FocusScope { FocusScope {
@ -25,8 +27,7 @@ FocusScope {
width: parent.width width: parent.width
height: parent.height height: parent.height
signal sendToScript(var message); property var tabletProxy: Tablet.getTablet("com.highfidelity.interface.tablet.system");
signal canceled();
property bool isHMD: false property bool isHMD: false
property bool gotoPreviousApp: false; property bool gotoPreviousApp: false;
@ -52,6 +53,7 @@ FocusScope {
} }
function tryDestroy() { function tryDestroy() {
tabletProxy.gotoHomeScreen();
} }
MouseArea { MouseArea {
@ -76,7 +78,7 @@ FocusScope {
interval: 200 interval: 200
onTriggered: { onTriggered: {
if (MenuInterface.isOptionChecked("Use 3D Keyboard")) { if (MenuInterface.isOptionChecked("Use 3D Keyboard") && HMD.active) {
KeyboardScriptingInterface.raised = true; KeyboardScriptingInterface.raised = true;
} }
} }
@ -168,7 +170,9 @@ FocusScope {
Component.onDestruction: { Component.onDestruction: {
loginKeyboard.raised = false; loginKeyboard.raised = false;
KeyboardScriptingInterface.raised = false; if (HMD.active) {
KeyboardScriptingInterface.raised = false;
}
} }
Component.onCompleted: { Component.onCompleted: {