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

fixing case with KB pw prop./bolding error msg

Browse source
This commit is contained in:
Wayne Chen 2018-12-06 10:52:10 -08:00
parent 30f1016f1c
commit 9f894ae977
4 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,6 +81,7 @@ Item {
color: "red"; color: "red";
font.family: signUpBody.fontFamily font.family: signUpBody.fontFamily
font.pixelSize: 18 font.pixelSize: 18
font.bold: completeProfileBody.fontBold
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: completeProfileBody.errorString text: completeProfileBody.errorString

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

@ -124,6 +124,7 @@ Item {
color: "red"; color: "red";
font.family: linkAccountBody.fontFamily font.family: linkAccountBody.fontFamily
font.pixelSize: linkAccountBody.textFieldFontSize font.pixelSize: linkAccountBody.textFieldFontSize
font.bold: linkAccountBody.fontBold
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: "" text: ""

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

@ -75,7 +75,9 @@ Item {
emailField.anchors.top = usernameField.bottom; emailField.anchors.top = usernameField.bottom;
emailField.anchors.topMargin = 1.5 * hifi.dimensions.contentSpacing.y; emailField.anchors.topMargin = 1.5 * hifi.dimensions.contentSpacing.y;
passwordField.text = ""; passwordField.text = "";
usernameField.focus = true; usernameField.forceActiveFocus();
root.text = "";
root.isPassword = false;
loginContainer.visible = true; loginContainer.visible = true;
} }
@ -117,6 +119,7 @@ Item {
color: "red"; color: "red";
font.family: signUpBody.fontFamily font.family: signUpBody.fontFamily
font.pixelSize: 18 font.pixelSize: 18
font.bold: signUpBody.fontBold
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: "" text: ""
@ -135,7 +138,6 @@ Item {
top: parent.top top: parent.top
topMargin: loginErrorMessage.height topMargin: loginErrorMessage.height
} }
focus: true
Keys.onPressed: { Keys.onPressed: {
if (!usernameField.visible) { if (!usernameField.visible) {
return; return;

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

@ -102,6 +102,7 @@ Item {
leftMargin: (parent.width - width) / 2 leftMargin: (parent.width - width) / 2
topMargin: hifi.dimensions.contentSpacing.y topMargin: hifi.dimensions.contentSpacing.y
} }
focus: true
font.family: "Fira Sans" font.family: "Fira Sans"
font.pixelSize: usernameCollisionBody.textFieldFontSize font.pixelSize: usernameCollisionBody.textFieldFontSize
styleRenderType: Text.QtRendering styleRenderType: Text.QtRendering
@ -112,7 +113,9 @@ Item {
onFocusChanged: { onFocusChanged: {
root.text = ""; root.text = "";
root.isPassword = !focus; if (focus) {
root.isPassword = false;
}
} }
Keys.onPressed: { Keys.onPressed: {
@ -128,6 +131,10 @@ Item {
break; break;
} }
} }
Component.onCompleted: {
root.text = "";
root.isPassword = false;
}
} }
// Override ScrollingWindow's keyboard that would be at very bottom of dialog. // Override ScrollingWindow's keyboard that would be at very bottom of dialog.