From 565bf7f6bd0c69c5ff314302f5b38b566b08f997 Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Tue, 11 Sep 2018 09:08:35 -0700 Subject: [PATCH] adding correct implementation of show password --- .../resources/qml/LoginDialog/LinkAccountBody.qml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml index f7216584e0..06a371c478 100644 --- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml +++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml @@ -198,19 +198,23 @@ Item { Rectangle { id: showPasswordHitbox z: 10 - // x: parent.width - (parent.height * 31/16) x: passwordField.width - ((passwordField.height) * 31 / 23) width: parent.width - (parent.width - (parent.height * 31/16)) - // width: passwordField.width - (passwordField.width - (((passwordField.height) * 31/23))) height: parent.height + anchors { + right: parent.right + } color: "transparent" Image { id: showPasswordImage - // x: passwordField.width - ((passwordField.height) * 31 / 23) y: (passwordField.height - (passwordField.height * 16 / 23)) / 2 width: passwordField.width - (passwordField.width - (((passwordField.height) * 31/23))) height: passwordField.height * 16 / 23 + anchors { + right: parent.right + rightMargin: 3 + } source: "../../images/eyeOpen.svg" } @@ -223,12 +227,8 @@ Item { showPassword = !showPassword; passwordField.echoMode = showPassword ? TextInput.Normal : TextInput.Password; showPasswordImage.source = showPassword ? "../../images/eyeClosed.svg" : "../../images/eyeOpen.svg"; - showPasswordImage.width = passwordField.width - (passwordField.width - (passwordField.height * 31/23)); - showPasswordImage.x = -(showPasswordImage.width - passwordField.width); showPasswordImage.height = showPassword ? passwordField.height : passwordField.height * 16 / 23; showPasswordImage.y = showPassword ? 0 : (passwordField.height - showPasswordImage.height) / 2; - showPasswordHitbox.width = showPasswordImage.width; - showPasswordHitbox.x = showPasswordImage.x; } } }