From e53e8435ebfc3dec0a39011570d4a6ad8721aa92 Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Mon, 10 Dec 2018 11:51:34 -0800
Subject: [PATCH] more fixing of logging in

---
 .../qml/LoginDialog/LoggingInBody.qml         | 28 +++++++------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/interface/resources/qml/LoginDialog/LoggingInBody.qml b/interface/resources/qml/LoginDialog/LoggingInBody.qml
index 476aaf959a..63eff7132d 100644
--- a/interface/resources/qml/LoginDialog/LoggingInBody.qml
+++ b/interface/resources/qml/LoginDialog/LoggingInBody.qml
@@ -17,8 +17,10 @@ import controlsUit 1.0 as HifiControlsUit
 import stylesUit 1.0 as HifiStylesUit
 
 Item {
-
     id: loggingInBody
+    clip: true
+    height: root.height
+    width: root.width
     property int textFieldHeight: 31
     property int loggingInGlyphRightMargin: 10
     property string fontFamily: "Raleway"
@@ -70,28 +72,22 @@ Item {
         loggingInText.wrapMode = Text.NoWrap;
 
         if (loggingInBody.linkSteam) {
+            loggingInGlyph.visible = true;
             loggingInText.text = "Linking to Steam";
-            loggingInText.left = loggingInHeader.left;
-            loggingInText.leftMargin = (loggingInHeader.width - loggingInTextMetrics.width) / 2;
+            loggingInText.x = loggingInHeader.width/2 - loggingInTextMetrics.width/2 + loggingInGlyphTextMetrics.width/2;
             loginDialog.linkSteam();
         } else if (loggingInBody.withSteam) {
             loggingInGlyph.visible = true;
             loggingInText.text = "Logging in to Steam";
-            loggingInText.left = loggingInHeader.left;
-            loggingInText.leftMargin = 0;
             loggingInText.x = loggingInHeader.width/2 - loggingInTextMetrics.width/2 + loggingInGlyphTextMetrics.width/2;
         } else if (loggingInBody.withOculus) {
             loggingInGlyph.text = hifi.glyphs.oculus;
             loggingInGlyph.visible = true;
             loggingInText.text = "Logging in to Oculus";
-            loggingInText.left = loggingInHeader.left;
-            loggingInText.leftMargin = 0;
             loggingInText.x = loggingInHeader.width/2 - loggingInTextMetrics.width/2 + loggingInGlyphTextMetrics.width/2;
         } else {
-            loggingInText.centerIn = loggingInHeader;
             loggingInText.text = "Logging in";
-            loggingInText.anchors.bottom = loggingInHeader.bottom;
-            loggingInText.anchors.bottomMargin = hifi.dimensions.contentSpacing.y;
+            loggingInText.anchors.centerIn = loggingInHeader;
         }
         loggingInSpinner.visible = true;
     }
@@ -106,17 +102,15 @@ Item {
             // reset the flag.
             loggingInGlyph.visible = false;
             loggingInText.text = "You are now logged into Steam!";
-            loggingInText.left = loggingInHeader.left;
-            loggingInText.leftMargin = (loggingInHeader.width - loggingInTextMetrics.width) / 2;
             loggingInText.x = 0;
+            loggingInText.anchors.centerIn = loggingInHeader;
             loggedInGlyph.visible = true;
         } else if (loggingInBody.withOculus) {
             // reset the flag.
             loggingInGlyph.visible = false;
             loggingInText.text = "You are now logged into Oculus!";
-            loggingInText.left = loggingInHeader.left;
-            loggingInText.leftMargin = (loggingInHeader.width - loggingInTextMetrics.width) / 2;
             loggingInText.x = 0;
+            loggingInText.anchors.centerIn = loggingInHeader;
             loggedInGlyph.text = hifi.glyphs.oculus;
             loggedInGlyph.visible = true;
         } else {
@@ -127,14 +121,12 @@ Item {
 
     Item {
         id: mainContainer
-        width: root.width
-        height: root.height
+        anchors.fill: parent
         onHeightChanged: d.resize(); onWidthChanged: d.resize();
 
         Item {
             id: loggingInContainer
-            width: parent.width
-            height: parent.height
+            anchors.fill: parent
             onHeightChanged: d.resize(); onWidthChanged: d.resize();
 
             Item {