diff --git a/interface/resources/qml/LoginDialog.qml b/interface/resources/qml/LoginDialog.qml index 08895ecaa1..2e7ff39ed6 100644 --- a/interface/resources/qml/LoginDialog.qml +++ b/interface/resources/qml/LoginDialog.qml @@ -40,7 +40,6 @@ ModalWindow { Loader { id: bodyLoader - anchors.fill: parent source: loginDialog.isSteamRunning() ? "LoginDialog/SignInBody.qml" : "LoginDialog/LinkAccountBody.qml" } } diff --git a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml index 05cacd9f73..e06ce239ab 100644 --- a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml +++ b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml @@ -18,8 +18,8 @@ import "../styles-uit" Item { id: completeProfileBody clip: true - width: pane.width - height: pane.height + width: root.pane.width + height: root.pane.height QtObject { id: d @@ -33,8 +33,8 @@ Item { termsContainer.contentWidth)) var targetHeight = 5 * hifi.dimensions.contentSpacing.y + buttons.height + additionalTextContainer.height + termsContainer.height - width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)) - height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight)) + parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)) + parent.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight)) } } diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml index 3a1d2c98b6..e27635dbbd 100644 --- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml +++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml @@ -19,9 +19,8 @@ import "../styles-uit" Item { id: linkAccountBody clip: true - width: root.pane.width height: root.pane.height - + width: root.pane.width property bool failAfterSignUp: false function login() { @@ -54,8 +53,8 @@ Item { targetHeight += hifi.dimensions.contentSpacing.y + additionalInformation.height } - width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)); - height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight)) + parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)); + parent.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight)) + (keyboardEnabled && keyboardRaised ? (200 + 2 * hifi.dimensions.contentSpacing.y) : hifi.dimensions.contentSpacing.y); } } diff --git a/interface/resources/qml/LoginDialog/SignInBody.qml b/interface/resources/qml/LoginDialog/SignInBody.qml index 924463e18c..167ed1640a 100644 --- a/interface/resources/qml/LoginDialog/SignInBody.qml +++ b/interface/resources/qml/LoginDialog/SignInBody.qml @@ -18,8 +18,8 @@ import "../styles-uit" Item { id: signInBody clip: true - width: pane.width - height: pane.height + width: root.pane.width + height: root.pane.height property bool required: false @@ -43,8 +43,8 @@ Item { var targetWidth = Math.max(titleWidth, mainTextContainer.contentWidth) var targetHeight = mainTextContainer.height + 3 * hifi.dimensions.contentSpacing.y + buttons.height - width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)) - height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight)) + parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)) + parent.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight)) } } diff --git a/interface/resources/qml/LoginDialog/SignUpBody.qml b/interface/resources/qml/LoginDialog/SignUpBody.qml index e19b8f469f..197f5a3c93 100644 --- a/interface/resources/qml/LoginDialog/SignUpBody.qml +++ b/interface/resources/qml/LoginDialog/SignUpBody.qml @@ -19,8 +19,8 @@ import "../styles-uit" Item { id: signupBody clip: true - width: root.pane.width height: root.pane.height + width: root.pane.width function signup() { mainTextContainer.visible = false @@ -47,8 +47,8 @@ Item { 4 * hifi.dimensions.contentSpacing.y + form.height + hifi.dimensions.contentSpacing.y + buttons.height; - width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)); - height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight)) + parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)); + parent.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight)) + (keyboardEnabled && keyboardRaised ? (200 + 2 * hifi.dimensions.contentSpacing.y) : 0); } } diff --git a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml index 29a82afcf3..18c831b3a9 100644 --- a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml +++ b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml @@ -47,8 +47,8 @@ Item { hifi.dimensions.contentSpacing.y + textField.height + hifi.dimensions.contentSpacing.y + buttons.height - width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)) - height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight)) + parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)) + parent.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight)) + (keyboardEnabled && keyboardRaised ? (200 + 2 * hifi.dimensions.contentSpacing.y) : hifi.dimensions.contentSpacing.y) } } diff --git a/interface/resources/qml/LoginDialog/WelcomeBody.qml b/interface/resources/qml/LoginDialog/WelcomeBody.qml index 1b85e1776e..eb91956532 100644 --- a/interface/resources/qml/LoginDialog/WelcomeBody.qml +++ b/interface/resources/qml/LoginDialog/WelcomeBody.qml @@ -17,8 +17,8 @@ import "../styles-uit" Item { id: welcomeBody clip: true - width: pane.width - height: pane.height + width: root.pane.width + height: root.pane.height property bool welcomeBack: false @@ -39,8 +39,8 @@ Item { var targetWidth = Math.max(titleWidth, mainTextContainer.contentWidth) var targetHeight = mainTextContainer.height + 3 * hifi.dimensions.contentSpacing.y + buttons.height - width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)) - height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight)) + parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)) + parent.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight)) } }