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

Fix some anchors and add logging

Browse source
This commit is contained in:
Frost 2021-04-12 00:36:41 +00:00
parent b5258ead80
commit 3d0c5e26b7
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -133,6 +133,7 @@ Item {
emailField.text = keepMeLoggedInCheckbox.checked ? savedUsername === "Unknown user" ? "" : savedUsername : ""; emailField.text = keepMeLoggedInCheckbox.checked ? savedUsername === "Unknown user" ? "" : savedUsername : "";
var metaverseServer = Settings.getValue("private/selectedMetaverseURL", ""); var metaverseServer = Settings.getValue("private/selectedMetaverseURL", "");
console.log("Saved metaverse server:", metaverseServer);
metaverseServerField.text = metaverseServer; metaverseServerField.text = metaverseServer;
} else { } else {
// ####### TODO // ####### TODO
@ -384,7 +385,7 @@ Item {
font.pixelSize: linkAccountBody.textFieldFontSize font.pixelSize: linkAccountBody.textFieldFontSize
styleRenderType: Text.QtRendering styleRenderType: Text.QtRendering
anchors { anchors {
top: loginDialogTextContainer.bottom top: passwordField.bottom
topMargin: 1.5 * hifi.dimensions.contentSpacing.y topMargin: 1.5 * hifi.dimensions.contentSpacing.y
} }
placeholderText: "Metaverse Server (optional)" placeholderText: "Metaverse Server (optional)"
@ -403,6 +404,7 @@ Item {
case Qt.Key_Return: case Qt.Key_Return:
event.accepted = true; event.accepted = true;
if (!isLoggingInToDomain) { if (!isLoggingInToDomain) {
console.log("Setting metaverse server to", metaverseServerField.text);
Settings.setValue("private/selectedMetaverseURL", metaverseServerField.text); Settings.setValue("private/selectedMetaverseURL", metaverseServerField.text);
} }
linkAccountBody.login(); linkAccountBody.login();
@ -426,9 +428,9 @@ Item {
color: hifi.colors.white; color: hifi.colors.white;
visible: !isLoggingInToDomain visible: !isLoggingInToDomain
anchors { anchors {
top: passwordField.bottom; top: metaverseServerField.bottom;
topMargin: hifi.dimensions.contentSpacing.y; topMargin: hifi.dimensions.contentSpacing.y;
left: passwordField.left; left: metaverseServerField.left;
} }
onCheckedChanged: { onCheckedChanged: {
Settings.setValue("keepMeLoggedIn", checked); Settings.setValue("keepMeLoggedIn", checked);
@ -749,4 +751,4 @@ Item {
break; break;
} }
} }
metaverseServerField }