From 29f4a3857b349e3ee31643990c1fc40fafda2017 Mon Sep 17 00:00:00 2001 From: Camila Date: Wed, 7 Apr 2021 13:29:22 +0200 Subject: [PATCH] Reposition qml elements for the folder status icon. Signed-off-by: Camila --- src/gui/tray/Window.qml | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml index 585bac2b4..8d26dba8a 100644 --- a/src/gui/tray/Window.qml +++ b/src/gui/tray/Window.qml @@ -405,10 +405,6 @@ Window { RowLayout { id: openLocalFolderRowLayout - height: Style.trayWindowHeaderHeight - width: height - anchors.left: accountControlRowLayout.right - anchors.top: accountControlRowLayout.top spacing: 0 Layout.preferredWidth: Style.trayWindowHeaderHeight Layout.preferredHeight: Style.trayWindowHeaderHeight @@ -418,26 +414,27 @@ Window { visible: UserModel.currentUser.hasLocalFolder icon.source: "qrc:///client/theme/white/folder.svg" onClicked: UserModel.openCurrentAccountLocalFolder() - } - - Rectangle { - id: folderStateIndicatorBackground - width: Style.folderStateIndicatorSize - height: width - anchors.top: openLocalFolderButton.verticalCenter - anchors.left: openLocalFolderButton.horizontalCenter - color: Style.ncBlue - radius: width*0.5 - } + + Rectangle { + id: folderStateIndicatorBackground + width: Style.folderStateIndicatorSize + height: width + anchors.top: openLocalFolderButton.verticalCenter + anchors.left: openLocalFolderButton.horizontalCenter + color: Style.ncBlue + radius: width*0.5 + z: 1 + } + } - Image { + Image { id: folderStateIndicator source: UserModel.isUserConnected(UserModel.currentUserId) ? Style.stateOnlineImageSource : Style.stateOfflineImageSource cache: false - x: folderStateIndicatorBackground.x - y: folderStateIndicatorBackground.y + anchors.top: openLocalFolderButton.verticalCenter + anchors.left: openLocalFolderButton.horizontalCenter sourceSize.width: Style.folderStateIndicatorSize sourceSize.height: Style.folderStateIndicatorSize -- 2.30.2