From a2ebb67cd55ba5f300d994cc3e40c7c51527c2eb Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Wed, 12 Dec 2018 17:33:22 -0800
Subject: [PATCH] dev feedback/fixing keyboard in profile creation

---
 .../qml/LoginDialog/UsernameCollisionBody.qml | 24 +++++++------------
 interface/src/LoginStateManager.h             |  6 ++---
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
index c94543342d..d44f5b733c 100644
--- a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
+++ b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
@@ -131,22 +131,6 @@ Item {
                         break;
                 }
             }
-            Component.onCompleted: {
-                root.text = "";
-                root.isPassword = false;
-            }
-        }
-
-        // Override ScrollingWindow's keyboard that would be at very bottom of dialog.
-        HifiControlsUit.Keyboard {
-            raised: keyboardEnabled && keyboardRaised
-            numeric: punctuationMode
-            anchors {
-                left: parent.left
-                right: parent.right
-                bottom: buttons.top
-                bottomMargin: keyboardRaised ? 2 * hifi.dimensions.contentSpacing.y : 0
-            }
         }
 
         Item {
@@ -201,6 +185,14 @@ Item {
         }
     }
 
+    Component.onCompleted: {
+        //but rise Tablet's one instead for Tablet interface
+        root.keyboardEnabled = HMD.active;
+        root.keyboardRaised = Qt.binding( function() { return keyboardRaised; })
+        root.text = "";
+        d.resize();
+    }
+
     Connections {
         target: loginDialog
         onHandleCreateCompleted: {
diff --git a/interface/src/LoginStateManager.h b/interface/src/LoginStateManager.h
index db9b24bdeb..ad25e87ee6 100644
--- a/interface/src/LoginStateManager.h
+++ b/interface/src/LoginStateManager.h
@@ -20,8 +20,8 @@
 
 class LoginStateManager : protected ReadWriteLockable {
 public:
-    LoginStateManager() {}
-    ~LoginStateManager() {}
+    LoginStateManager() = default;
+    ~LoginStateManager() = default;
 
     void setUp();
     void tearDown();
@@ -38,4 +38,4 @@ private:
     unsigned int _rightLoginPointerID { PointerEvent::INVALID_POINTER_ID };
 };
 
-#endif // hifi_LoginStateManager_h
\ No newline at end of file
+#endif // hifi_LoginStateManager_h