3D Keyboard

interface/resources/qml/controlsUit/Keyboard.qml

@@ -36,13 +36,29 @@ Rectangle {
 
     readonly property int raisedHeight: keyboardHeight + (showMirrorText ? keyboardRowHeight : 0)
 
-    height: enabled && raised ? raisedHeight : 0
-    visible: enabled && raised
+    height: 0
+    visible: false
 
     property bool shiftMode: false
     property bool numericShiftMode: false
 
+
+    onPasswordChanged: {
+        var use3DKeyboard = (typeof MenuInterface === "undefined") ? false : MenuInterface.isOptionChecked("Use 3D Keyboard");
+        if (use3DKeyboard) {
+            KeyboardScriptingInterface.password = password;
+        }
+    }
+
     onRaisedChanged: {
+        var use3DKeyboard = (typeof MenuInterface === "undefined") ? false : MenuInterface.isOptionChecked("Use 3D Keyboard");
+        if (!use3DKeyboard) {
+            keyboardBase.height = raised ? raisedHeight : 0;
+            keyboardBase.visible = raised;
+        } else {
+            KeyboardScriptingInterface.raised = raised;
+            KeyboardScriptingInterface.password = raised ? password : false;
+        }
         mirroredText = "";
     }
 

interface/resources/qml/dialogs/TabletLoginDialog.qml

@@ -127,6 +127,10 @@ TabletModalWindow {
         }
     }
 
+    Component.onDestruction: {
+        loginKeyboard.raised = false;
+    }
+
     Keyboard {
         id: loginKeyboard
         raised: root.keyboardEnabled && root.keyboardRaised

interface/resources/qml/hifi/AvatarApp.qml

@@ -19,7 +19,7 @@ Rectangle {
     HifiControls.Keyboard {
         id: keyboard
         z: 1000
-        raised: parent.keyboardEnabled && parent.keyboardRaised
+        raised: parent.keyboardEnabled && parent.keyboardRaised && HMD.active
         numeric: parent.punctuationMode
         anchors {
             left: parent.left
@@ -204,7 +204,8 @@ Rectangle {
 
     property bool isInManageState: false
 
-    Component.onCompleted: {
+    Component.onDestruction: {
+        keyboard.raised = false;
     }
 
     AvatarAppStyle {
@@ -235,6 +236,8 @@ Rectangle {
         avatarIconVisible: mainPageVisible
         settingsButtonVisible: mainPageVisible
         onSettingsClicked: {
+            displayNameInput.focus = false;
+            root.keyboardRaised = false;
             settings.open(currentAvatarSettings, currentAvatar.avatarScale);
         }
     }
@@ -344,6 +347,10 @@ Rectangle {
                 emitSendToScript({'method' : 'changeDisplayName', 'displayName' : text})
                 focus = false;
             }
+
+            onFocusChanged: {
+                root.keyboardRaised = focus;
+            }
         }
 
         ShadowImage {

interface/resources/qml/hifi/avatarapp/Settings.qml

@@ -14,6 +14,22 @@ Rectangle {
 
     signal scaleChanged(real scale);
 
+    property bool keyboardEnabled: true
+    property bool keyboardRaised: false
+    property bool punctuationMode: false
+
+    HifiControlsUit.Keyboard {
+        id: keyboard
+        z: 1000
+        raised: parent.keyboardEnabled && parent.keyboardRaised
+        numeric: parent.punctuationMode
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+    }
+
     property alias onSaveClicked: dialogButtons.onYesClicked
     property alias onCancelClicked: dialogButtons.onNoClicked
 
@@ -314,6 +330,10 @@ Rectangle {
                 anchors.left: parent.left
                 anchors.right: parent.right
                 placeholderText: 'user\\file\\dir'
+
+                onFocusChanged: {
+                    keyboardRaised = (avatarAnimationUrlInputText.focus || avatarCollisionSoundUrlInputText.focus);
+                }
             }
         }
 
@@ -340,6 +360,10 @@ Rectangle {
                 anchors.left: parent.left
                 anchors.right: parent.right
                 placeholderText: 'https://hifi-public.s3.amazonaws.com/sounds/Collisions-'
+
+                onFocusChanged: {
+                    keyboardRaised = (avatarAnimationUrlInputText.focus || avatarCollisionSoundUrlInputText.focus);
+                }
             }
         }