Fix image selection and overlay bugs

2019-07-16 04:37:39 -04:00
parent 73ecbaad10
commit aef777d853
4 changed files with 15 additions and 15 deletions
--- a/src/qml/Pages/EditAccount/Profile.qml
+++ b/src/qml/Pages/EditAccount/Profile.qml
@@ -43,8 +43,8 @@ HGridLayout {

        id: avatar
        userId: editAccount.userId
-        imageUrl: fileDialog.selectedFile || defaultImageUrl
-        toolTipImageUrl: null
+        imageUrl: fileDialog.selectedFile || fileDialog.file || defaultImageUrl
+        toolTipImageUrl: ""

        Layout.alignment: Qt.AlignHCenter

@@ -54,7 +54,8 @@ HGridLayout {
        HRectangle {
            z: 10
            visible: opacity > 0
-            opacity: ! avatar.imageUrl || avatar.hovered ? 1 : 0
+            opacity: ! fileDialog.dialog.visible &&
+                     (! avatar.imageUrl || avatar.hovered) ? 1 : 0
            Behavior on opacity { HNumberAnimation {} }

            anchors.fill: parent