Skip to content
Snippets Groups Projects
Verified Commit a703e6f0 authored by Nicolas Werner's avatar Nicolas Werner
Browse files

Remove double padding on redactions

parent a5bfc833
No related branches found
No related tags found
No related merge requests found
Pipeline #2183 passed
...@@ -10,7 +10,7 @@ import im.nheko 1.0 ...@@ -10,7 +10,7 @@ import im.nheko 1.0
Rectangle{ Rectangle{
required property real delegateWidth required property real delegateWidth
height: redactedLayout.implicitHeight + 2 * Nheko.paddingSmall height: redactedLayout.implicitHeight + Nheko.paddingSmall
width: redactedLayout.implicitWidth + 2 * Nheko.paddingMedium width: redactedLayout.implicitWidth + 2 * Nheko.paddingMedium
radius: fontMetrics.lineSpacing / 2 + 2 * Nheko.paddingSmall radius: fontMetrics.lineSpacing / 2 + 2 * Nheko.paddingSmall
color: Nheko.colors.alternateBase color: Nheko.colors.alternateBase
...@@ -18,6 +18,8 @@ Rectangle{ ...@@ -18,6 +18,8 @@ Rectangle{
RowLayout { RowLayout {
id: redactedLayout id: redactedLayout
anchors.centerIn: parent anchors.centerIn: parent
spacing: Nheko.paddingSmall
Image { Image {
id: trashImg id: trashImg
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
...@@ -27,13 +29,14 @@ Rectangle{ ...@@ -27,13 +29,14 @@ Rectangle{
} }
Label { Label {
id: redactedLabel id: redactedLabel
Layout.margins: Nheko.paddingSmall Layout.margins: 0
Layout.alignment: Qt.AlignVCenter | Qt.AlignRight Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
Layout.fillWidth: true Layout.fillWidth: true
Layout.maximumWidth: delegateWidth - 4 * Nheko.paddingSmall - trashImg.width - 2 * Nheko.paddingMedium Layout.maximumWidth: delegateWidth - 4 * Nheko.paddingSmall - trashImg.width - 2 * Nheko.paddingMedium
property var redactedPair: room.formatRedactedEvent(eventId) property var redactedPair: room.formatRedactedEvent(eventId)
text: redactedPair["first"] text: redactedPair["first"]
wrapMode: Label.WordWrap wrapMode: Label.WordWrap
color: Nheko.colors.text
ToolTip.text: redactedPair["second"] ToolTip.text: redactedPair["second"]
ToolTip.visible: hh.hovered ToolTip.visible: hh.hovered
...@@ -42,4 +45,4 @@ Rectangle{ ...@@ -42,4 +45,4 @@ Rectangle{
} }
} }
} }
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment