From 3910448367b2b1d936be503c320f7073d4df12bd Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Thu, 11 Jun 2020 15:36:13 -0400 Subject: [PATCH 01/14] Fix models not scaling correctly when loading due to timeout. --- scripts/system/create/edit.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/system/create/edit.js b/scripts/system/create/edit.js index 3d8578715d..82d6ee9953 100644 --- a/scripts/system/create/edit.js +++ b/scripts/system/create/edit.js @@ -603,15 +603,19 @@ var toolBar = (function () { Script.setTimeout(dimensionsCheckFunction, DIMENSIONS_CHECK_INTERVAL); } // Make sure the model entity is loaded before we try to figure out - // its dimensions. - var MAX_LOADED_CHECKS = 10; + // its dimensions. We need to give ample time to load the entity. + var MAX_LOADED_CHECKS = 100; // 100 * 100ms = 10 seconds. var LOADED_CHECK_INTERVAL = 100; var isLoadedCheckCount = 0; var entityIsLoadedCheck = function() { isLoadedCheckCount++; if (isLoadedCheckCount === MAX_LOADED_CHECKS || Entities.isLoaded(entityID)) { var naturalDimensions = Entities.getEntityProperties(entityID, "naturalDimensions").naturalDimensions; - + + if (isLoadedCheckCount === MAX_LOADED_CHECKS) { + console.log("Model entity failed to load in time: " + (MAX_LOADED_CHECKS * LOADED_CHECK_INTERVAL) + " ... setting dimensions to: " + JSON.stringify(naturalDimensions)) + } + Entities.editEntity(entityID, { visible: true, dimensions: naturalDimensions From 3e585267e4db09be79a755d0f0b093bdde922911 Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Thu, 18 Jun 2020 01:11:07 -0400 Subject: [PATCH 02/14] Fix gizmo size issue post auto-resize of a new model. --- scripts/system/create/edit.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/system/create/edit.js b/scripts/system/create/edit.js index 82d6ee9953..ab21c5776c 100644 --- a/scripts/system/create/edit.js +++ b/scripts/system/create/edit.js @@ -621,6 +621,10 @@ var toolBar = (function () { dimensions: naturalDimensions }) dimensionsCheckCallback(); + // We want to update the selection manager again since the script has moved on without us. + selectionManager.clearSelections(this); + entityListTool.sendUpdate(); + selectionManager.setSelections([entityID], this); return; } Script.setTimeout(entityIsLoadedCheck, LOADED_CHECK_INTERVAL); From bf230a415a9eb0b7554e344765993295793ab72f Mon Sep 17 00:00:00 2001 From: motofckr9k Date: Sun, 21 Jun 2020 00:33:52 +0200 Subject: [PATCH 03/14] Initial commit --- interface/resources/qml/LoginDialog.qml | 4 +- .../qml/LoginDialog/LinkAccountBody.qml | 67 ++++++++++--------- .../qml/LoginDialog/LoggingInBody.qml | 1 + 3 files changed, 38 insertions(+), 34 deletions(-) diff --git a/interface/resources/qml/LoginDialog.qml b/interface/resources/qml/LoginDialog.qml index ec239206ae..a27bf0c3bb 100644 --- a/interface/resources/qml/LoginDialog.qml +++ b/interface/resources/qml/LoginDialog.qml @@ -3,10 +3,10 @@ // // Created by David Rowe on 3 Jun 2015 // Copyright 2015 High Fidelity, Inc. +// Copyright 2020 Vircadia contributors. +// // Distributed under the Apache License, Version 2.0. -// // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -// import Hifi 1.0 import QtQuick 2.4 diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml index 4f0ea2e607..f3e10b53c6 100644 --- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml +++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml @@ -3,6 +3,7 @@ // // Created by Clement on 7/18/16 // Copyright 2015 High Fidelity, Inc. +// Copyright 2020 Vircadia contributors. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -485,7 +486,41 @@ Item { } } } + + TextMetrics { + id: dismissButtonTextMetrics + font: loginErrorMessage.font + text: dismissButton.text + } + HifiControlsUit.Button { + id: dismissButton + width: loginButton.width + height: d.minHeightButton + anchors { + top: cantAccessText.bottom + topMargin: hifi.dimensions.contentSpacing.y + left: loginButton.left + } +// color: hifi.buttons.noneBorderlessWhite + text: qsTr("Skip Log In") + fontCapitalization: Font.MixedCase + fontFamily: linkAccountBody.fontFamily + fontSize: linkAccountBody.fontSize + fontBold: linkAccountBody.fontBold + visible: loginDialog.getLoginDialogPoppedUp() && !linkAccountBody.linkSteam && !linkAccountBody.linkOculus; + onClicked: { + if (linkAccountBody.loginDialogPoppedUp) { + var data = { + "action": "user dismissed login screen" + }; + UserActivityLogger.logAction("encourageLoginDialog", data); + loginDialog.dismissLoginDialog(); + } + root.tryDestroy(); + } + } } + Item { id: signUpContainer width: loginContainer.width @@ -543,38 +578,6 @@ Item { } } } - TextMetrics { - id: dismissButtonTextMetrics - font: loginErrorMessage.font - text: dismissButton.text - } - HifiControlsUit.Button { - id: dismissButton - width: dismissButtonTextMetrics.width - height: d.minHeightButton - anchors { - bottom: parent.bottom - right: parent.right - margins: 3 * hifi.dimensions.contentSpacing.y - } - color: hifi.buttons.noneBorderlessWhite - text: qsTr("No thanks, take me in-world! >") - fontCapitalization: Font.MixedCase - fontFamily: linkAccountBody.fontFamily - fontSize: linkAccountBody.fontSize - fontBold: linkAccountBody.fontBold - visible: loginDialog.getLoginDialogPoppedUp() && !linkAccountBody.linkSteam && !linkAccountBody.linkOculus; - onClicked: { - if (linkAccountBody.loginDialogPoppedUp) { - var data = { - "action": "user dismissed login screen" - }; - UserActivityLogger.logAction("encourageLoginDialog", data); - loginDialog.dismissLoginDialog(); - } - root.tryDestroy(); - } - } } Connections { diff --git a/interface/resources/qml/LoginDialog/LoggingInBody.qml b/interface/resources/qml/LoginDialog/LoggingInBody.qml index a0029dc40b..beeab74d40 100644 --- a/interface/resources/qml/LoginDialog/LoggingInBody.qml +++ b/interface/resources/qml/LoginDialog/LoggingInBody.qml @@ -3,6 +3,7 @@ // // Created by Wayne Chen on 10/18/18 // Copyright 2018 High Fidelity, Inc. +// Copyright 2020 Vircadia contributors. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html From e8a3009b96fabdc32aa737283893f4529cdfe713 Mon Sep 17 00:00:00 2001 From: motofckr9k Date: Sun, 21 Jun 2020 01:04:52 +0200 Subject: [PATCH 04/14] Remove color from dismissButton --- interface/resources/qml/LoginDialog/LinkAccountBody.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml index f3e10b53c6..064fbafa0b 100644 --- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml +++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml @@ -501,7 +501,6 @@ Item { topMargin: hifi.dimensions.contentSpacing.y left: loginButton.left } -// color: hifi.buttons.noneBorderlessWhite text: qsTr("Skip Log In") fontCapitalization: Font.MixedCase fontFamily: linkAccountBody.fontFamily From 3da755fb951c194bbe9cb3f81477f58cedcc23b9 Mon Sep 17 00:00:00 2001 From: motofckr9k Date: Sun, 21 Jun 2020 02:53:05 +0200 Subject: [PATCH 05/14] Change button text, and move it to answer "Don't have an account?" --- .../qml/LoginDialog/LinkAccountBody.qml | 80 ++++++++++++------- 1 file changed, 49 insertions(+), 31 deletions(-) diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml index 064fbafa0b..1111116a28 100644 --- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml +++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml @@ -487,37 +487,7 @@ Item { } } - TextMetrics { - id: dismissButtonTextMetrics - font: loginErrorMessage.font - text: dismissButton.text - } - HifiControlsUit.Button { - id: dismissButton - width: loginButton.width - height: d.minHeightButton - anchors { - top: cantAccessText.bottom - topMargin: hifi.dimensions.contentSpacing.y - left: loginButton.left - } - text: qsTr("Skip Log In") - fontCapitalization: Font.MixedCase - fontFamily: linkAccountBody.fontFamily - fontSize: linkAccountBody.fontSize - fontBold: linkAccountBody.fontBold - visible: loginDialog.getLoginDialogPoppedUp() && !linkAccountBody.linkSteam && !linkAccountBody.linkOculus; - onClicked: { - if (linkAccountBody.loginDialogPoppedUp) { - var data = { - "action": "user dismissed login screen" - }; - UserActivityLogger.logAction("encourageLoginDialog", data); - loginDialog.dismissLoginDialog(); - } - root.tryDestroy(); - } - } + } Item { @@ -576,6 +546,54 @@ Item { "errorString": "" }); } } + + Text { + id: signUpTextSecond + text: qsTr("or..") + anchors { + left: signUpShortcutText.right + leftMargin: hifi.dimensions.contentSpacing.x + } + lineHeight: 1 + color: "white" + font.family: linkAccountBody.fontFamily + font.pixelSize: linkAccountBody.textFieldFontSize + font.bold: linkAccountBody.fontBold + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter + } + + TextMetrics { + id: dismissButtonTextMetrics + font: loginErrorMessage.font + text: dismissButton.text + } + HifiControlsUit.Button { + id: dismissButton + width: loginButton.width + height: d.minHeightButton + anchors { + top: signUpText.bottom + topMargin: hifi.dimensions.contentSpacing.y + left: loginButton.left + } + text: qsTr("Use without account, log in anonymously") + fontCapitalization: Font.MixedCase + fontFamily: linkAccountBody.fontFamily + fontSize: linkAccountBody.fontSize + fontBold: linkAccountBody.fontBold + visible: loginDialog.getLoginDialogPoppedUp() && !linkAccountBody.linkSteam && !linkAccountBody.linkOculus; + onClicked: { + if (linkAccountBody.loginDialogPoppedUp) { + var data = { + "action": "user dismissed login screen" + }; + UserActivityLogger.logAction("encourageLoginDialog", data); + loginDialog.dismissLoginDialog(); + } + root.tryDestroy(); + } + } } } From 41563b14a86a21e2d0e94cc3956eddb612082d87 Mon Sep 17 00:00:00 2001 From: motofckr9k Date: Sun, 21 Jun 2020 03:05:54 +0200 Subject: [PATCH 06/14] Move signUpContainer closer to loginContainer --- interface/resources/qml/LoginDialog/LinkAccountBody.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml index 1111116a28..8232a78eea 100644 --- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml +++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml @@ -498,7 +498,7 @@ Item { anchors { left: loginContainer.left top: loginContainer.bottom - topMargin: 0.15 * parent.height + topMargin: 0.10 * parent.height } TextMetrics { id: signUpTextMetrics From 75f6246ac9e09e61cd804293d79eb86aeda69646 Mon Sep 17 00:00:00 2001 From: motofckr9k Date: Sun, 21 Jun 2020 03:16:19 +0200 Subject: [PATCH 07/14] Move them even closer --- interface/resources/qml/LoginDialog/LinkAccountBody.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml index 8232a78eea..e37941f20d 100644 --- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml +++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml @@ -498,7 +498,7 @@ Item { anchors { left: loginContainer.left top: loginContainer.bottom - topMargin: 0.10 * parent.height + topMargin: 0.05 * parent.height } TextMetrics { id: signUpTextMetrics From 7b34872b81c3c8c7b3e92859ab98b9542d03f70a Mon Sep 17 00:00:00 2001 From: motofckr9k Date: Sun, 21 Jun 2020 03:59:33 +0200 Subject: [PATCH 08/14] Replace domain-server favicon --- domain-server/resources/web/favicon.ico | Bin 5430 -> 4286 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/domain-server/resources/web/favicon.ico b/domain-server/resources/web/favicon.ico index becc1b8e8b5bc3bd677093a21f348fe077c712a6..cbcf3649027f248f37e92b956e2cb32716f91814 100644 GIT binary patch literal 4286 zcmb_fTWnO<6}^y3Zok@(s{Lw;T2*R4B2}tNuuZUm1Ons%#COIs9($gC%)(oj{ZN~0Yb6@uanE(=Z-rK5Ug{x6hWet-<}VFMJlY3eVKK>ih6WY%sSrehm-T z5v%Hn2b08#G*RA2lx-p&XeLTqh?2G`tGHu$dP#?T^iOpr*PCCnDymQAHq_WyA0Zx# z5|6})wFzn*4a7>pks->Ph-I6Jr7c8h8&TXr6mNMACGFq(e?ZIz0|8V8Z=$k_@P!Do zn%G!FtPc~93XV9jww733M?BO(tVn4tmbqNC5hV)4lvUiG?EGeC;m5%tJ+@-LK13^t za3xV4AgY2yKyXye;dnekJStqoiHBU~6=k4X55n4gGL5;YDEmye1XVndjCEJCb{5o;0!x^OXUb~K?eSjAfoepr2E z%{VrhM59TheMHhE>itB*N5tpxvA2)dbAagXC!QK0%#_xJ>W8DvvPNP)h9&LkyJ5gq z^Io)7+(4^IWKE*kB$`YjV-hK!gTvutZ#O;XpVx?u(Yb!)HIb$lLkDxkTPAPa-};UD z7;@Xqv)E=5TTNn%NwifEE%R_FK76#_`KzZqhE5O_)pOcZns9aLU|1&p6g?IgHw+S=k#UQZ(?sHv8R&wv7dO_Pwe&)yBto059v#Po2NFBBU)>TxS#fgbLuth z>ee20b3%AnB^VrUs*K7qSJHM1-`i1y{y;eff<%9i=nD|N0p_s?CxSzI)8(W6)@4t9 z``16$K534U)3?=Y_Lbl1UMM}d86o*lud`BeQaquup|#vP6w2aIh;$_T+AnJpQma#H#r7_ziVvuO-Pj^c$dakPdw zTup^#K8`(=wEys$r-uFKD@2F(>K&SRJ*M_K09OvfJ|-b2%cri3k?twep0UkuodPygG`J#0Z8H z#Hl!OB1RmK5<_9)d54dKA=+0)Jonr0|3zy;yegT|VUpM0^S`Y?$;g>UAh=f^?BYSdPJsH_rV_` zo^blGF0N;$;vmy&jV7}gO%mrCsBpYoH;3bRl=hVuy!TH2o7f-JUKO7T2FZyX0dn#K z&wF(?1m^l6^Gar>%&LbPXst}9F_tdJc!n5D6Bkl*IE0Uv>dC3=-aCJFM0-_yDtRH9 zB^V?lF1+Y@FDEC7`kJ{u$jp?vExUu75vg*VZz#%5G+xI9N=`{`cbc>>pYi+;Z(Ju5!Fe1+X|0Q?{FO63np&K%?O?Fq z-0!`|&Jkyuv@XRPl3CAG5&NA!xLW8*-kDQJ1~dn*A2)<~du=#Bf8^xGGiTk}^4tE` zWpeTza`IjBKkw3h`)5=>6>t0`LX{DcnbL=zfSwz|L6=GUjWe|Wah3M_S82a@mG3VX_LTfzJm#^#Am*0hbki3?eQOJS#@kf5WH%KN)4`hdv9wg1fmsYR* z$o<I(hGWPk7#51V*0zY=Nb}trEZ^fIzDI}j}BVT*9=53WX! z`H8-NGgn5weh+CFv<;(c+AzNUfnj`69)B~8qSp=M9(n9Ej0J^{`Pd3yljrXL$sO)} Oa<|lwTB>HQjQ<5&xQ$H! literal 5430 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 From 56362461fcd062e9b1b9c91907dcd4c3db8a8783 Mon Sep 17 00:00:00 2001 From: motofckr9k Date: Sun, 21 Jun 2020 05:51:37 +0200 Subject: [PATCH 09/14] Fix "or" not dissappearing in popup window --- interface/resources/qml/LoginDialog/LinkAccountBody.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml index e37941f20d..af888936ae 100644 --- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml +++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml @@ -549,7 +549,7 @@ Item { Text { id: signUpTextSecond - text: qsTr("or..") + text: qsTr("or") anchors { left: signUpShortcutText.right leftMargin: hifi.dimensions.contentSpacing.x @@ -561,6 +561,7 @@ Item { font.bold: linkAccountBody.fontBold verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter + visible: loginDialog.getLoginDialogPoppedUp() && !linkAccountBody.linkSteam && !linkAccountBody.linkOculus; } TextMetrics { From 34887ec604818d0da0e5956f6a37942e6faeb8cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Mon, 22 Jun 2020 04:10:21 +0200 Subject: [PATCH 10/14] Remove unnessesary whitespaces --- interface/resources/qml/LoginDialog/LinkAccountBody.qml | 2 -- 1 file changed, 2 deletions(-) diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml index af888936ae..6ac5be6fd4 100644 --- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml +++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml @@ -486,8 +486,6 @@ Item { } } } - - } Item { From ef5d6bfc2f8cac67f8f04e9175986739ba2f1e42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Mon, 22 Jun 2020 04:11:34 +0200 Subject: [PATCH 11/14] Remove unnessesary copyright --- interface/resources/qml/LoginDialog/LoggingInBody.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/interface/resources/qml/LoginDialog/LoggingInBody.qml b/interface/resources/qml/LoginDialog/LoggingInBody.qml index beeab74d40..a0029dc40b 100644 --- a/interface/resources/qml/LoginDialog/LoggingInBody.qml +++ b/interface/resources/qml/LoginDialog/LoggingInBody.qml @@ -3,7 +3,6 @@ // // Created by Wayne Chen on 10/18/18 // Copyright 2018 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html From 3fe1dddee20107f34a7255999b1218c5b872ccfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Mon, 22 Jun 2020 04:19:10 +0200 Subject: [PATCH 12/14] Replace tabs with spaces --- .../qml/LoginDialog/LinkAccountBody.qml | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml index 6ac5be6fd4..e679202455 100644 --- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml +++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml @@ -563,36 +563,36 @@ Item { } TextMetrics { - id: dismissButtonTextMetrics - font: loginErrorMessage.font - text: dismissButton.text - } - HifiControlsUit.Button { - id: dismissButton - width: loginButton.width - height: d.minHeightButton - anchors { - top: signUpText.bottom - topMargin: hifi.dimensions.contentSpacing.y + id: dismissButtonTextMetrics + font: loginErrorMessage.font + text: dismissButton.text + } + HifiControlsUit.Button { + id: dismissButton + width: loginButton.width + height: d.minHeightButton + anchors { + top: signUpText.bottom + topMargin: hifi.dimensions.contentSpacing.y left: loginButton.left - } - text: qsTr("Use without account, log in anonymously") - fontCapitalization: Font.MixedCase - fontFamily: linkAccountBody.fontFamily - fontSize: linkAccountBody.fontSize - fontBold: linkAccountBody.fontBold - visible: loginDialog.getLoginDialogPoppedUp() && !linkAccountBody.linkSteam && !linkAccountBody.linkOculus; - onClicked: { - if (linkAccountBody.loginDialogPoppedUp) { - var data = { - "action": "user dismissed login screen" - }; - UserActivityLogger.logAction("encourageLoginDialog", data); - loginDialog.dismissLoginDialog(); - } - root.tryDestroy(); - } - } + } + text: qsTr("Use without account, log in anonymously") + fontCapitalization: Font.MixedCase + fontFamily: linkAccountBody.fontFamily + fontSize: linkAccountBody.fontSize + fontBold: linkAccountBody.fontBold + visible: loginDialog.getLoginDialogPoppedUp() && !linkAccountBody.linkSteam && !linkAccountBody.linkOculus; + onClicked: { + if (linkAccountBody.loginDialogPoppedUp) { + var data = { + "action": "user dismissed login screen" + }; + UserActivityLogger.logAction("encourageLoginDialog", data); + loginDialog.dismissLoginDialog(); + } + root.tryDestroy(); + } + } } } From 5b0855fa6e72166ef44c98b0daa9873edcc82c04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Mon, 22 Jun 2020 06:18:05 +0200 Subject: [PATCH 13/14] Fix indentation --- interface/resources/qml/LoginDialog/LinkAccountBody.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml index e679202455..209dd631a8 100644 --- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml +++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml @@ -586,10 +586,10 @@ Item { if (linkAccountBody.loginDialogPoppedUp) { var data = { "action": "user dismissed login screen" - }; - UserActivityLogger.logAction("encourageLoginDialog", data); - loginDialog.dismissLoginDialog(); - } + }; + UserActivityLogger.logAction("encourageLoginDialog", data); + loginDialog.dismissLoginDialog(); + } root.tryDestroy(); } } From 147bea6ba9d4e6cc168ba21412143823f54d6e3b Mon Sep 17 00:00:00 2001 From: David Rowe Date: Mon, 22 Jun 2020 21:12:46 +1200 Subject: [PATCH 14/14] Fix indentation --- interface/resources/qml/LoginDialog/LinkAccountBody.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml index 209dd631a8..571b7e074c 100644 --- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml +++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml @@ -585,10 +585,10 @@ Item { onClicked: { if (linkAccountBody.loginDialogPoppedUp) { var data = { - "action": "user dismissed login screen" - }; - UserActivityLogger.logAction("encourageLoginDialog", data); - loginDialog.dismissLoginDialog(); + "action": "user dismissed login screen" + }; + UserActivityLogger.logAction("encourageLoginDialog", data); + loginDialog.dismissLoginDialog(); } root.tryDestroy(); }