Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 21:16:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix resizing of LoginDialog and friends

Browse source
This commit is contained in:
Stephen Birarda 2016-12-12 11:31:26 -08:00
parent 691ce4312e
commit a0663bdf31
7 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/LoginDialog.qml
View file

@ -40,7 +40,6 @@ ModalWindow {
Loader { Loader {
id: bodyLoader id: bodyLoader
anchors.fill: parent
source: loginDialog.isSteamRunning() ? "LoginDialog/SignInBody.qml" : "LoginDialog/LinkAccountBody.qml" source: loginDialog.isSteamRunning() ? "LoginDialog/SignInBody.qml" : "LoginDialog/LinkAccountBody.qml"
} }
} }

8
interface/resources/qml/LoginDialog/CompleteProfileBody.qml
View file

@ -18,8 +18,8 @@ import "../styles-uit"
Item { Item {
id: completeProfileBody id: completeProfileBody
clip: true clip: true
width: pane.width width: root.pane.width
height: pane.height height: root.pane.height
QtObject { QtObject {
id: d id: d
@ -33,8 +33,8 @@ Item {
termsContainer.contentWidth)) termsContainer.contentWidth))
var targetHeight = 5 * hifi.dimensions.contentSpacing.y + buttons.height + additionalTextContainer.height + termsContainer.height 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)) parent.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.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight))
} }
} }

7
interface/resources/qml/LoginDialog/LinkAccountBody.qml
View file

@ -19,9 +19,8 @@ import "../styles-uit"
Item { Item {
id: linkAccountBody id: linkAccountBody
clip: true clip: true
width: root.pane.width
height: root.pane.height height: root.pane.height
width: root.pane.width
property bool failAfterSignUp: false property bool failAfterSignUp: false
function login() { function login() {
@ -54,8 +53,8 @@ Item {
targetHeight += hifi.dimensions.contentSpacing.y + additionalInformation.height targetHeight += hifi.dimensions.contentSpacing.y + additionalInformation.height
} }
width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)); parent.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.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight))
+ (keyboardEnabled && keyboardRaised ? (200 + 2 * hifi.dimensions.contentSpacing.y) : hifi.dimensions.contentSpacing.y); + (keyboardEnabled && keyboardRaised ? (200 + 2 * hifi.dimensions.contentSpacing.y) : hifi.dimensions.contentSpacing.y);
} }
} }

8
interface/resources/qml/LoginDialog/SignInBody.qml
View file

@ -18,8 +18,8 @@ import "../styles-uit"
Item { Item {
id: signInBody id: signInBody
clip: true clip: true
width: pane.width width: root.pane.width
height: pane.height height: root.pane.height
property bool required: false property bool required: false
@ -43,8 +43,8 @@ Item {
var targetWidth = Math.max(titleWidth, mainTextContainer.contentWidth) var targetWidth = Math.max(titleWidth, mainTextContainer.contentWidth)
var targetHeight = mainTextContainer.height + 3 * hifi.dimensions.contentSpacing.y + buttons.height var targetHeight = mainTextContainer.height + 3 * hifi.dimensions.contentSpacing.y + buttons.height
width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)) parent.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.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight))
} }
} }

6
interface/resources/qml/LoginDialog/SignUpBody.qml
View file

@ -19,8 +19,8 @@ import "../styles-uit"
Item { Item {
id: signupBody id: signupBody
clip: true clip: true
width: root.pane.width
height: root.pane.height height: root.pane.height
width: root.pane.width
function signup() { function signup() {
mainTextContainer.visible = false mainTextContainer.visible = false
@ -47,8 +47,8 @@ Item {
4 * hifi.dimensions.contentSpacing.y + form.height + 4 * hifi.dimensions.contentSpacing.y + form.height +
hifi.dimensions.contentSpacing.y + buttons.height; hifi.dimensions.contentSpacing.y + buttons.height;
width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)); parent.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.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight))
+ (keyboardEnabled && keyboardRaised ? (200 + 2 * hifi.dimensions.contentSpacing.y) : 0); + (keyboardEnabled && keyboardRaised ? (200 + 2 * hifi.dimensions.contentSpacing.y) : 0);
} }
} }

4
interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
View file

@ -47,8 +47,8 @@ Item {
hifi.dimensions.contentSpacing.y + textField.height + hifi.dimensions.contentSpacing.y + textField.height +
hifi.dimensions.contentSpacing.y + buttons.height hifi.dimensions.contentSpacing.y + buttons.height
width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)) parent.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.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight))
+ (keyboardEnabled && keyboardRaised ? (200 + 2 * hifi.dimensions.contentSpacing.y) : hifi.dimensions.contentSpacing.y) + (keyboardEnabled && keyboardRaised ? (200 + 2 * hifi.dimensions.contentSpacing.y) : hifi.dimensions.contentSpacing.y)
} }
} }

8
interface/resources/qml/LoginDialog/WelcomeBody.qml
View file

@ -17,8 +17,8 @@ import "../styles-uit"
Item { Item {
id: welcomeBody id: welcomeBody
clip: true clip: true
width: pane.width width: root.pane.width
height: pane.height height: root.pane.height
property bool welcomeBack: false property bool welcomeBack: false
@ -39,8 +39,8 @@ Item {
var targetWidth = Math.max(titleWidth, mainTextContainer.contentWidth) var targetWidth = Math.max(titleWidth, mainTextContainer.contentWidth)
var targetHeight = mainTextContainer.height + 3 * hifi.dimensions.contentSpacing.y + buttons.height var targetHeight = mainTextContainer.height + 3 * hifi.dimensions.contentSpacing.y + buttons.height
width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)) parent.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.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight))
} }
} }