From c8783776fe01c4e6525b6e65dfe7a56abf51dd11 Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Fri, 30 Nov 2018 13:02:29 -0800 Subject: [PATCH] removing mousearea, fixing continue button --- .../resources/qml/LoginDialog/LinkAccountBody.qml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml index 3f2303d9f7..1c01f675e3 100644 --- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml +++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml @@ -21,7 +21,6 @@ Item { z: -2 id: linkAccountBody clip: true - focus: true height: root.height width: root.width property int textFieldHeight: 31 @@ -158,6 +157,7 @@ Item { topMargin: loginErrorMessage.height } placeholderText: "Username or Email" + focus: true activeFocusOnPress: true Keys.onPressed: { switch (event.key) { @@ -326,7 +326,7 @@ Item { height: d.minHeightButton color: hifi.buttons.none; anchors { - top: cantAccessContainer.bottom + top: cantAccessText.bottom topMargin: hifi.dimensions.contentSpacing.y left: emailField.left } @@ -444,16 +444,6 @@ Item { } } } - MouseArea { - anchors.fill: parent - onClicked: { - print("clicked"); - if (!emailField.focus && !passwordField.focus) { - print("forcing active focus"); - emailField.forceActiveFocus(); - } - } - } Component.onCompleted: { //but rise Tablet's one instead for Tablet interface @@ -462,7 +452,6 @@ Item { root.text = ""; d.resize(); init(); - emailField.forceActiveFocus(); } Keys.onPressed: {