diff options
| author | Claudio Cambra <claudio.cambra@gmail.com> | 2022-08-10 21:18:11 +0300 |
|---|---|---|
| committer | Claudio Cambra <claudio.cambra@gmail.com> | 2022-08-17 21:01:12 +0300 |
| commit | bedcfbd14c0323d8f4595249feb673bb702a21d1 (patch) | |
| tree | 94ca488c9f0f8b91c09ee70d3ab40f752653f2dd /src | |
| parent | d44d839a2621e6d9dfac1e1469c966b26725f4e2 (diff) | |
Fix alignment of predefined status contents regardless of emoji fonts
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/PredefinedStatusButton.qml | 9 | ||||
| -rw-r--r-- | src/gui/UserStatusSelector.qml | 7 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/gui/PredefinedStatusButton.qml b/src/gui/PredefinedStatusButton.qml index 3186bb5e1..dabef84ae 100644 --- a/src/gui/PredefinedStatusButton.qml +++ b/src/gui/PredefinedStatusButton.qml @@ -28,7 +28,8 @@ AbstractButton { leftPadding: Style.standardSpacing / 2 rightPadding: Style.standardSpacing / 2 - property real internalSpacing: Style.standardSpacing + property int emojiWidth: -1 + property int internalSpacing: Style.standardSpacing property string emoji: "" background: Rectangle { @@ -37,15 +38,19 @@ AbstractButton { } contentItem: Row { - spacing: internalSpacing + spacing: root.internalSpacing Label { + width: root.emojiWidth > 0 ? root.emojiWidth : implicitWidth text: emoji + horizontalAlignment: Image.AlignHCenter + verticalAlignment: Image.AlignVCenter } Label { text: root.text color: Style.ncTextColor + verticalAlignment: Text.AlignVCenter } } } diff --git a/src/gui/UserStatusSelector.qml b/src/gui/UserStatusSelector.qml index 68809ae4b..482505769 100644 --- a/src/gui/UserStatusSelector.qml +++ b/src/gui/UserStatusSelector.qml @@ -141,6 +141,7 @@ ColumnLayout { } RowLayout { + id: statusFieldLayout Layout.fillWidth: true spacing: 0 @@ -264,9 +265,11 @@ ColumnLayout { model: userStatusSelectorModel.predefinedStatuses PredefinedStatusButton { - id: control Layout.fillWidth: true - internalSpacing: Style.standardSpacing + fieldButton.padding + userStatusMessageTextField.padding + + leftPadding: 0 + emojiWidth: fieldButton.width + internalSpacing: statusFieldLayout.spacing + userStatusMessageTextField.leftPadding emoji: modelData.icon text: "<b>%1</b> – %2".arg(modelData.message).arg(userStatusSelectorModel.clearAtReadable(modelData)) |