fixing display of user/pw incorrect

This commit is contained in:
Wayne Chen 2018-09-18 09:57:26 -07:00
parent f82063ed46
commit 4807b5af7b

View file

@ -43,7 +43,7 @@ Item {
function resize() { function resize() {
var targetWidth = Math.max(titleWidth, form.contentWidth); 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; 4 * hifi.dimensions.contentSpacing.y + form.height;
if (additionalInformation.visible) { if (additionalInformation.visible) {
@ -106,14 +106,15 @@ Item {
ShortcutText { ShortcutText {
id: mainTextContainer id: mainTextContainer
anchors { anchors {
top: parent.top top: flavorText.bottom
left: parent.left left: parent.left
margins: 0 margins: 0
topMargin: hifi.dimensions.contentSpacing.y topMargin: 1.5 * hifi.dimensions.contentSpacing.y
} }
visible: false visible: false
text: qsTr("Username or password incorrect.") text: qsTr("Username or password incorrect.")
height: flavorText.height - 20
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
color: hifi.colors.redAccent color: hifi.colors.redAccent
lineHeight: 1 lineHeight: 1
@ -128,7 +129,7 @@ Item {
anchors { anchors {
top: mainTextContainer.bottom top: mainTextContainer.bottom
topMargin: 2 * hifi.dimensions.contentSpacing.y topMargin: 1.5 * hifi.dimensions.contentSpacing.y
} }
spacing: 2 * hifi.dimensions.contentSpacing.y spacing: 2 * hifi.dimensions.contentSpacing.y