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

Fix height, tabbing, and other stuff

Browse source
This commit is contained in:
Frost 2021-04-11 23:33:05 +00:00
parent 5a09064f50
commit b5258ead80
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -131,6 +131,9 @@ Item {
if (!isLoggingInToDomain) { if (!isLoggingInToDomain) {
var savedUsername = Settings.getValue("keepMeLoggedIn/savedUsername", ""); var savedUsername = Settings.getValue("keepMeLoggedIn/savedUsername", "");
emailField.text = keepMeLoggedInCheckbox.checked ? savedUsername === "Unknown user" ? "" : savedUsername : ""; emailField.text = keepMeLoggedInCheckbox.checked ? savedUsername === "Unknown user" ? "" : savedUsername : "";
var metaverseServer = Settings.getValue("private/selectedMetaverseURL", "");
metaverseServerField.text = metaverseServer;
} else { } else {
// ####### TODO // ####### TODO
} }
@ -160,7 +163,7 @@ Item {
Item { Item {
id: loginContainer id: loginContainer
width: displayNameField.width width: displayNameField.width
height: errorContainer.height + loginDialogTextContainer.height + displayNameField.height + emailField.height + passwordField.height + 5.5 * hifi.dimensions.contentSpacing.y + height: errorContainer.height + loginDialogTextContainer.height + displayNameField.height + emailField.height + passwordField.height + metaverseServerField.height + 5.5 * hifi.dimensions.contentSpacing.y +
keepMeLoggedInCheckbox.height + loginButton.height + cantAccessTextMetrics.height + continueButton.height keepMeLoggedInCheckbox.height + loginButton.height + cantAccessTextMetrics.height + continueButton.height
anchors { anchors {
top: parent.top top: parent.top
@ -250,7 +253,7 @@ Item {
break; break;
case Qt.Key_Backtab: case Qt.Key_Backtab:
event.accepted = true; event.accepted = true;
passwordField.focus = true; metaverseServerField.focus = true;
break; break;
case Qt.Key_Enter: case Qt.Key_Enter:
case Qt.Key_Return: case Qt.Key_Return:
@ -360,7 +363,7 @@ Item {
switch (event.key) { switch (event.key) {
case Qt.Key_Tab: case Qt.Key_Tab:
event.accepted = true; event.accepted = true;
displayNameField.focus = true; metaverseServerField.focus = true;
break; break;
case Qt.Key_Backtab: case Qt.Key_Backtab:
event.accepted = true; event.accepted = true;
@ -386,12 +389,11 @@ Item {
} }
placeholderText: "Metaverse Server (optional)" placeholderText: "Metaverse Server (optional)"
activeFocusOnPress: true activeFocusOnPress: true
visible: !isLoggingInToDomain
Keys.onPressed: { Keys.onPressed: {
switch (event.key) { switch (event.key) {
case Qt.Key_Tab: case Qt.Key_Tab:
event.accepted = true; event.accepted = true;
emailField.focus = true; displayNameField.focus = true;
break; break;
case Qt.Key_Backtab: case Qt.Key_Backtab:
event.accepted = true; event.accepted = true;