Reposition qml elements for the folder status icon.
authorCamila <hello@camila.codes>
Wed, 7 Apr 2021 11:29:22 +0000 (13:29 +0200)
committerallexzander (Rebase PR Action) <allexzander@users.noreply.github.com>
Thu, 8 Apr 2021 07:10:59 +0000 (07:10 +0000)
Signed-off-by: Camila <hello@camila.codes>
src/gui/tray/Window.qml

index 585bac2b419fcfb65a2b508744de99bc32684b3a..8d26dba8a1fca2bc7af4dcda443b91d52a30e95d 100644 (file)
@@ -405,10 +405,6 @@ Window {
 \r
                 RowLayout {\r
                     id: openLocalFolderRowLayout\r
-                    height: Style.trayWindowHeaderHeight\r
-                    width: height\r
-                    anchors.left: accountControlRowLayout.right\r
-                    anchors.top: accountControlRowLayout.top\r
                     spacing: 0\r
                     Layout.preferredWidth:  Style.trayWindowHeaderHeight\r
                     Layout.preferredHeight: Style.trayWindowHeaderHeight\r
@@ -418,26 +414,27 @@ Window {
                         visible: UserModel.currentUser.hasLocalFolder\r
                         icon.source: "qrc:///client/theme/white/folder.svg"\r
                         onClicked: UserModel.openCurrentAccountLocalFolder()\r
-                    }\r
-                                             \r
-                    Rectangle {\r
-                        id: folderStateIndicatorBackground\r
-                        width: Style.folderStateIndicatorSize\r
-                        height: width\r
-                        anchors.top: openLocalFolderButton.verticalCenter\r
-                        anchors.left: openLocalFolderButton.horizontalCenter\r
-                        color: Style.ncBlue\r
-                        radius: width*0.5\r
-                    }\r
+                        \r
+                        Rectangle {\r
+                            id: folderStateIndicatorBackground\r
+                            width: Style.folderStateIndicatorSize\r
+                            height: width\r
+                            anchors.top: openLocalFolderButton.verticalCenter\r
+                            anchors.left: openLocalFolderButton.horizontalCenter\r
+                            color: Style.ncBlue\r
+                            radius: width*0.5\r
+                            z: 1\r
+                        }\r
+                   }\r
 \r
-                    Image {\r
+                   Image {\r
                         id: folderStateIndicator\r
                         source: UserModel.isUserConnected(UserModel.currentUserId)\r
                                 ? Style.stateOnlineImageSource\r
                                 : Style.stateOfflineImageSource\r
                         cache: false\r
-                        x: folderStateIndicatorBackground.x\r
-                        y: folderStateIndicatorBackground.y\r
+                        anchors.top: openLocalFolderButton.verticalCenter\r
+                        anchors.left: openLocalFolderButton.horizontalCenter\r
                         \r
                         sourceSize.width: Style.folderStateIndicatorSize\r
                         sourceSize.height: Style.folderStateIndicatorSize\r