Fix #3067: missing apps icon.

Signed-off-by: Camila <hello@camila.codes>

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index f27bdc3505eb46e263979ab47212a2050b857f2d..5e0baf19f5c5b553de830fe1d8535d1f8e7f9452 100644 (file)
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -403,67 +403,59 @@ Window {
                     }\r
                 }\r
 \r
-                // Filler between account dropdown and header app buttons\r
-                Item {\r
-                    id: trayWindowHeaderSpacer\r
-                    Layout.fillWidth: true\r
-                }\r
-\r
-                HeaderButton {\r
-                    id: openLocalFolderButton\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
+                    \r
+                    HeaderButton {\r
+                        id: openLocalFolderButton\r
+                        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
-                    visible: UserModel.currentUser.hasLocalFolder\r
-                    icon.source: "qrc:///client/theme/white/folder.svg"\r
-                    onClicked: UserModel.openCurrentAccountLocalFolder()\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
+                        \r
+                        sourceSize.width: Style.folderStateIndicatorSize\r
+                        sourceSize.height: Style.folderStateIndicatorSize\r
+    \r
+                        Accessible.role: Accessible.Indicator\r
+                        Accessible.name: UserModel.isUserConnected(UserModel.currentUserId()) ? qsTr("Connected") : qsTr("Disconnected")\r
+                    }\r
 \r
                     Accessible.role: Accessible.Button\r
                     Accessible.name: qsTr("Open local folder of current account")\r
-                    Accessible.onPressAction: openLocalFolderButton.clicked()\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: folderStateRectangle\r
-                    width: Style.folderStateIndicatorSize\r
-                    height: width\r
-                    anchors.bottom: openLocalFolderButton.bottom\r
-                    anchors.right: openLocalFolderButton.right\r
-                    color: openLocalFolderButton.containsMouse ? "white" : "transparent"\r
-                    opacity: 0.2\r
-                    radius: width*0.5\r
-                }\r
-\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
-                    sourceSize.width: Style.folderStateIndicatorSize\r
-                    sourceSize.height: Style.folderStateIndicatorSize\r
-\r
-                    Accessible.role: Accessible.Indicator\r
-                    Accessible.name: UserModel.isUserConnected(UserModel.currentUserId()) ? qsTr("Connected") : qsTr("Disconnected")\r
                 }\r
 \r
                 HeaderButton {\r
                     id: trayWindowTalkButton\r
-\r
                     visible: UserModel.currentUser.serverHasTalk\r
                     icon.source: "qrc:///client/theme/white/talk-app.svg"\r
                     onClicked: UserModel.openCurrentAccountTalk()\r
-\r
+                    \r
                     Accessible.role: Accessible.Button\r
                     Accessible.name: qsTr("Open Nextcloud Talk in browser")\r
                     Accessible.onPressAction: trayWindowTalkButton.clicked()\r