Align user status and server url in all platforms.

Signed-off-by: Camila Ayres <[email protected]>
nextcloud · Mar 4, 2025 · 129a6ec · 129a6ec
1 parent e134c01
commit 129a6ec
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/gui/tray/CurrentAccountHeaderButton.qml b/src/gui/tray/CurrentAccountHeaderButton.qml
@@ -204,7 +204,7 @@ Button {
 
             EnforcedPlainTextLabel {
                 id: currentAccountServer
-                Layout.alignment: Qt.AlignLeft | Qt.AlignBottom
+                Layout.alignment: Qt.AlignLeft | Qt.AlignTop
                 width: Style.currentAccountLabelWidth
                 text: UserModel.currentUser ? UserModel.currentUser.server : ""
                 elide: Text.ElideRight
@@ -220,13 +220,15 @@ Button {
 
                 EnforcedPlainTextLabel {
                     id: emoji
+                    Layout.alignment: Qt.AlignLeft | Qt.AlignTop
                     visible: UserModel.currentUser && UserModel.currentUser.statusEmoji !== ""
                     width: Style.userStatusEmojiSize
                     text: UserModel.currentUser ? UserModel.currentUser.statusEmoji : ""
+                    topPadding: -Style.accountLabelsSpacing
                 }
                 EnforcedPlainTextLabel {
                     id: message
-                    Layout.alignment: Qt.AlignLeft | Qt.AlignBottom
+                    Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
                     Layout.fillWidth: true
                     visible: UserModel.currentUser && UserModel.currentUser.statusMessage !== ""
                     width: Style.currentAccountLabelWidth
@@ -235,6 +237,8 @@ Button {
                           : UserModel.currentUser ? UserModel.currentUser.server : ""
                     elide: Text.ElideRight
                     font.pixelSize: Style.subLinePixelSize
+                    leftPadding: Style.accountLabelsSpacing
+                    topPadding: -Style.userStatusAnchorsMargin
                 }
             }
         }

diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
@@ -97,19 +97,22 @@ AbstractButton {
 
                 EnforcedPlainTextLabel {
                     id: emoji
+                    Layout.alignment: Qt.AlignLeft | Qt.AlignTop
                     visible: model.statusEmoji !== ""
                     text: statusEmoji
                     topPadding: -Style.accountLabelsSpacing
                 }
 
                 EnforcedPlainTextLabel {
                     id: message
+                    Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
                     Layout.fillWidth: true
                     visible: model.statusMessage !== ""
                     text: statusMessage
                     elide: Text.ElideRight
                     font.pixelSize: Style.subLinePixelSize
                     leftPadding: Style.accountLabelsSpacing
+                    topPadding: -Style.userStatusAnchorsMargin
                 }
             }
 
@@ -121,6 +124,7 @@ AbstractButton {
                 text: server
                 elide: Text.ElideRight
                 font.pixelSize: Style.subLinePixelSize
+                topPadding: -Style.accountLabelsAnchorsMargin
             }
         }
 

diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
@@ -121,7 +121,8 @@ QtObject {
     property int userLineSpacing: smallSpacing
     property int accountServerAnchorsMargin: 10
     property int accountLabelsSpacing: 4
-    property int accountLabelsAnchorsMargin: 7
+    property int accountsServerMargin: 6
+    property int accountLabelsAnchorsMargin: 5
     property int accountLabelsLayoutMargin: 12
     property int accountLabelsLayoutTopMargin: 10