From c80f7c5a29b5da710d13517d1e3bc00feb73000d Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Mon, 10 Dec 2018 10:55:02 -0800 Subject: [PATCH 1/4] fixing typos --- interface/resources/qml/LoginDialog/CompleteProfileBody.qml | 2 +- interface/resources/qml/LoginDialog/UsernameCollisionBody.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml index 994bdae518..d8eeefb608 100644 --- a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml +++ b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml @@ -79,7 +79,7 @@ Item { id: loginErrorMessage; width: root.bannerWidth color: "red"; - font.family: signUpBody.fontFamily + font.family: completeProfileBody.fontFamily font.pixelSize: 18 font.bold: completeProfileBody.fontBold verticalAlignment: Text.AlignVCenter diff --git a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml index 8e56659eed..90376596d8 100644 --- a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml +++ b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml @@ -57,7 +57,7 @@ Item { hifi.dimensions.contentSpacing.y + buttons.height; parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)) - parent.height = root.height = Math.max(Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight)), mainContainer.height + hifi.dimensions.contentSpacing.y)); + parent.height = root.height = Math.max(Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight)), mainContainer.height + hifi.dimensions.contentSpacing.y); } } From 5c354c4bc776c7e34a6f9e0af6907951741b8f9a Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Mon, 10 Dec 2018 11:13:55 -0800 Subject: [PATCH 2/4] centering logged in text --- interface/resources/qml/LoginDialog/LoggingInBody.qml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/interface/resources/qml/LoginDialog/LoggingInBody.qml b/interface/resources/qml/LoginDialog/LoggingInBody.qml index b2d549136f..30a289c69b 100644 --- a/interface/resources/qml/LoginDialog/LoggingInBody.qml +++ b/interface/resources/qml/LoginDialog/LoggingInBody.qml @@ -101,11 +101,17 @@ 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; 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; loggedInGlyph.text = hifi.glyphs.oculus; loggedInGlyph.visible = true; } else { From 2a37ed21b2aaf196b6c422091f1a14c68460818c Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Mon, 10 Dec 2018 11:16:31 -0800 Subject: [PATCH 3/4] more centering --- interface/resources/qml/LoginDialog/LoggingInBody.qml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/interface/resources/qml/LoginDialog/LoggingInBody.qml b/interface/resources/qml/LoginDialog/LoggingInBody.qml index 30a289c69b..476aaf959a 100644 --- a/interface/resources/qml/LoginDialog/LoggingInBody.qml +++ b/interface/resources/qml/LoginDialog/LoggingInBody.qml @@ -70,17 +70,22 @@ Item { loggingInText.wrapMode = Text.NoWrap; if (loggingInBody.linkSteam) { - loggingInText.centerIn = loggingInHeader; loggingInText.text = "Linking to Steam"; + loggingInText.left = loggingInHeader.left; + loggingInText.leftMargin = (loggingInHeader.width - loggingInTextMetrics.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; From e53e8435ebfc3dec0a39011570d4a6ad8721aa92 Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Mon, 10 Dec 2018 11:51:34 -0800 Subject: [PATCH 4/4] 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 {