From 4807b5af7b49b722807a730e83714c21dd985484 Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Tue, 18 Sep 2018 09:57:26 -0700 Subject: [PATCH] fixing display of user/pw incorrect --- interface/resources/qml/LoginDialog/LinkAccountBody.qml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml index 57293cb5e3..a6f962a677 100644 --- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml +++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml @@ -43,7 +43,7 @@ Item { function resize() { var targetWidth = Math.max(titleWidth, form.contentWidth); - var targetHeight = hifi.dimensions.contentSpacing.y + mainTextContainer.height + + var targetHeight = hifi.dimensions.contentSpacing.y + flavorText.height + mainTextContainer.height + 4 * hifi.dimensions.contentSpacing.y + form.height; if (additionalInformation.visible) { @@ -106,14 +106,15 @@ Item { ShortcutText { id: mainTextContainer anchors { - top: parent.top + top: flavorText.bottom left: parent.left margins: 0 - topMargin: hifi.dimensions.contentSpacing.y + topMargin: 1.5 * hifi.dimensions.contentSpacing.y } visible: false text: qsTr("Username or password incorrect.") + height: flavorText.height - 20 wrapMode: Text.WordWrap color: hifi.colors.redAccent lineHeight: 1 @@ -128,7 +129,7 @@ Item { anchors { top: mainTextContainer.bottom - topMargin: 2 * hifi.dimensions.contentSpacing.y + topMargin: 1.5 * hifi.dimensions.contentSpacing.y } spacing: 2 * hifi.dimensions.contentSpacing.y