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

Update QML.

Browse source
This commit is contained in:
Kasen IO 2020-08-04 19:12:31 -04:00
parent 09f2153057
commit ffce0a9d27
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -143,21 +143,6 @@ Item {
visible: false; visible: false;
anchors.fill: parent; anchors.fill: parent;
} }
Text {
id: loginDialogText
text: qsTr("Log In")
anchors {
left: parent.left
}
lineHeight: 1
color: "white"
font.family: linkAccountBody.fontFamily
font.pixelSize: linkAccountBody.textFieldFontSize
font.bold: linkAccountBody.fontBold
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
}
Item { Item {
id: loginContainer id: loginContainer
@ -176,9 +161,9 @@ Item {
width: parent.width width: parent.width
height: loginErrorMessageTextMetrics.height height: loginErrorMessageTextMetrics.height
anchors { anchors {
bottom: displayNameField.top; bottom: loginDialogText.top;
bottomMargin: hifi.dimensions.contentSpacing.y; bottomMargin: hifi.dimensions.contentSpacing.y;
left: displayNameField.left; left: loginDialogText.left;
} }
TextMetrics { TextMetrics {
id: loginErrorMessageTextMetrics id: loginErrorMessageTextMetrics
@ -197,6 +182,23 @@ Item {
visible: false visible: false
} }
} }
Text {
id: loginDialogText
text: qsTr("Log In")
anchors {
top: parent.top
left: parent.left
topMargin: errorContainer.height
}
lineHeight: 1
color: "white"
font.family: linkAccountBody.fontFamily
font.pixelSize: linkAccountBody.textFieldFontSize
font.bold: linkAccountBody.fontBold
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
}
HifiControlsUit.TextField { HifiControlsUit.TextField {
id: displayNameField id: displayNameField
@ -205,8 +207,8 @@ Item {
font.pixelSize: linkAccountBody.textFieldFontSize font.pixelSize: linkAccountBody.textFieldFontSize
styleRenderType: Text.QtRendering styleRenderType: Text.QtRendering
anchors { anchors {
top: parent.top top: loginDialogText.bottom
topMargin: errorContainer.height topMargin: 1.5 * hifi.dimensions.contentSpacing.y
} }
placeholderText: "Display Name (optional)" placeholderText: "Display Name (optional)"
activeFocusOnPress: true activeFocusOnPress: true
@ -370,6 +372,7 @@ Item {
labelFontFamily: linkAccountBody.fontFamily labelFontFamily: linkAccountBody.fontFamily
labelFontSize: 18; labelFontSize: 18;
color: hifi.colors.white; color: hifi.colors.white;
visible: !isLoggingInToDomain
anchors { anchors {
top: passwordField.bottom; top: passwordField.bottom;
topMargin: hifi.dimensions.contentSpacing.y; topMargin: hifi.dimensions.contentSpacing.y;