Align predefined status text with the text in the text box

Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
nextcloud · Jun 17, 2022 · 5b5b639 · 5b5b639
1 parent 4fd634e
commit 5b5b639
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/gui/PredefinedStatusButton.qml b/src/gui/PredefinedStatusButton.qml
@@ -28,13 +28,24 @@ AbstractButton {
     leftPadding: Style.standardSpacing / 2
     rightPadding: Style.standardSpacing / 2
 
+    property real internalSpacing: Style.standardSpacing
+    property string emoji: ""
+
     background: Rectangle {
         color: root.hovered || root.checked ? Style.lightHover : "transparent"
         radius: Style.slightlyRoundedButtonRadius
     }
 
-    contentItem: Label {
-        text: root.text
-        color: Style.ncTextColor
+    contentItem: Row {
+        spacing: internalSpacing
+
+        Label {
+            text: emoji
+        }
+
+        Label {
+            text: root.text
+            color: Style.ncTextColor
+        }
     }
 }
diff --git a/src/gui/UserStatusSelector.qml b/src/gui/UserStatusSelector.qml
@@ -254,8 +254,10 @@ ColumnLayout {
             Layout.fillWidth: true
             Layout.leftMargin: Style.standardSpacing
             Layout.rightMargin: Style.standardSpacing
+            internalSpacing: Style.standardSpacing + fieldButton.padding + userStatusMessageTextField.padding
 
-            text: userStatusSelectorModel.predefinedStatus(index).icon + " <b>" + userStatusSelectorModel.predefinedStatus(index).message + "</b> - " + userStatusSelectorModel.predefinedStatusClearAt(index)
+            emoji: userStatusSelectorModel.predefinedStatus(index).icon
+            text: "<b>" + userStatusSelectorModel.predefinedStatus(index).message + "</b> - " + userStatusSelectorModel.predefinedStatusClearAt(index)
             onClicked: userStatusSelectorModel.setPredefinedStatus(index)
         }
     }