mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-24 05:55:59 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix alignment of predefined status contents regardless of emoji fonts

Browse source 
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
This commit is contained in:
Claudio Cambra 2022-08-10 20:18:11 +02:00
parent d44d839a26
commit bedcfbd14c
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gui/PredefinedStatusButton.qml
View file

@ -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
}
}
}

7
src/gui/UserStatusSelector.qml
View file

@ -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))