From f8a55a9196f844fd9658ab39af7c44061e62702a Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Wed, 5 Dec 2018 19:42:44 -0800
Subject: [PATCH] 25% opacity from PM req/fixing error message in profile body

---
 interface/resources/qml/LoginDialog.qml       |  2 +-
 .../qml/LoginDialog/CompleteProfileBody.qml   | 50 ++++++++++++-------
 .../qml/LoginDialog/LinkAccountBody.qml       |  5 +-
 .../resources/qml/OverlayLoginDialog.qml      |  2 +-
 .../qml/dialogs/TabletLoginDialog.qml         |  2 +-
 5 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/interface/resources/qml/LoginDialog.qml b/interface/resources/qml/LoginDialog.qml
index 380fcc38be..c9cf281b64 100644
--- a/interface/resources/qml/LoginDialog.qml
+++ b/interface/resources/qml/LoginDialog.qml
@@ -63,7 +63,7 @@ FocusScope {
         id: opaqueRect
         height: parent.height
         width: parent.width
-        opacity: 0.5
+        opacity: 0.25
         color: "black"
     }
 
diff --git a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml
index ab81515226..cab7c79942 100644
--- a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml
+++ b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml
@@ -61,23 +61,39 @@ Item {
             id: contentItem
             anchors.fill: parent
 
-            TextMetrics {
-                id: loginErrorMessageTextMetrics
-                font: loginErrorMessage.font
-                text: loginErrorMessage.text
-            }
-            Text {
-                id: loginErrorMessage
-                anchors.top: parent.top;
-                // above buttons.
-                anchors.topMargin: (parent.height - additionalTextContainer.height) / 2 - hifi.dimensions.contentSpacing.y - profileButton.height
-                anchors.left: parent.left;
-                anchors.leftMargin: (parent.width - loginErrorMessageTextMetrics.width) / 2;
-                color: "red";
-                font.family: completeProfileBody.fontFamily
-                font.pixelSize: completeProfileBody.fontSize
-                text: completeProfileBody.errorString
-                visible: true
+            Item {
+                id: errorContainer
+                width: parent.width
+                height: loginErrorMessageTextMetrics.height
+                anchors {
+                    bottom: buttons.top;
+                    bottomMargin: hifi.dimensions.contentSpacing.y;
+                    left: buttons.left;
+                }
+                TextMetrics {
+                    id: loginErrorMessageTextMetrics
+                    font: loginErrorMessage.font
+                    text: loginErrorMessage.text
+                }
+                Text {
+                    id: loginErrorMessage;
+                    width: root.bannerWidth
+                    color: "red";
+                    font.family: signUpBody.fontFamily
+                    font.pixelSize: 18
+                    verticalAlignment: Text.AlignVCenter
+                    horizontalAlignment: Text.AlignHCenter
+                    text: completeProfileBody.errorString
+                    visible: true
+                }
+                Component.onCompleted: {
+                    if (loginErrorMessageTextMetrics.width > 350 && root.isTablet) {
+                        loginErrorMessage.wrapMode = Text.WordWrap;
+                        loginErrorMessage.verticalAlignment = Text.AlignLeft;
+                        loginErrorMessage.horizontalAlignment = Text.AlignLeft;
+                        errorContainer.height = 2 * loginErrorMessageTextMetrics.height;
+                    }
+                }
             }
 
             Item {
diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
index 7476f1d126..5b895530c3 100644
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@@ -474,7 +474,7 @@ Item {
         onFocusEnabled: {
             Qt.callLater(function() {
                 emailField.forceActiveFocus();
-            })
+            });
         }
     }
 
@@ -485,6 +485,9 @@ Item {
         root.text = "";
         d.resize();
         init();
+        Qt.callLater(function() {
+            emailField.forceActiveFocus();
+        });
     }
 
     Keys.onPressed: {
diff --git a/interface/resources/qml/OverlayLoginDialog.qml b/interface/resources/qml/OverlayLoginDialog.qml
index 4f76fd10c8..6c2eb28ba0 100644
--- a/interface/resources/qml/OverlayLoginDialog.qml
+++ b/interface/resources/qml/OverlayLoginDialog.qml
@@ -64,7 +64,7 @@ FocusScope {
         id: opaqueRect
         height: parent.height
         width: parent.width
-        opacity: 0.5
+        opacity: 0.25
         color: "black"
     }
 
diff --git a/interface/resources/qml/dialogs/TabletLoginDialog.qml b/interface/resources/qml/dialogs/TabletLoginDialog.qml
index 3c998890ca..5868bf4cad 100644
--- a/interface/resources/qml/dialogs/TabletLoginDialog.qml
+++ b/interface/resources/qml/dialogs/TabletLoginDialog.qml
@@ -120,7 +120,7 @@ FocusScope {
         id: opaqueRect
         height: parent.height
         width: parent.width
-        opacity: 0.5
+        opacity: 0.25
         color: "black"
     }