From f8e57d60f5a2914e902edc75d389484eb4236f9c Mon Sep 17 00:00:00 2001
From: James Graham <james.h.graham@protonmail.com>
Date: Tue, 27 Sep 2022 17:18:43 +0000
Subject: [PATCH] Fix margins for images and videos

This patch makes it so that the margins for images and videos is the same as other components.
---
 .../NeoChat/Component/Timeline/MessageDelegate.qml |  2 --
 imports/NeoChat/Component/Timeline/RichLabel.qml   |  2 --
 .../Component/Timeline/TimelineContainer.qml       | 14 ++++----------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/imports/NeoChat/Component/Timeline/MessageDelegate.qml b/imports/NeoChat/Component/Timeline/MessageDelegate.qml
index 8d40c6cc7..923a0646e 100644
--- a/imports/NeoChat/Component/Timeline/MessageDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/MessageDelegate.qml
@@ -27,8 +27,6 @@ TimelineContainer {
         }
         Loader {
             id: linkPreviewLoader
-            Layout.rightMargin: Kirigami.Units.largeSpacing
-            Layout.leftMargin: Kirigami.Units.largeSpacing
             height: active ? item.implicitHeight : 0
             active: !currentRoom.usesEncryption && model.display && model.display.includes("http")
             visible: active
diff --git a/imports/NeoChat/Component/Timeline/RichLabel.qml b/imports/NeoChat/Component/Timeline/RichLabel.qml
index eaa0b96bf..93fc77edc 100644
--- a/imports/NeoChat/Component/Timeline/RichLabel.qml
+++ b/imports/NeoChat/Component/Timeline/RichLabel.qml
@@ -21,8 +21,6 @@ TextEdit {
     ListView.onReused: Qt.binding(() => !hasSpoiler.test(textMessage))
 
     Layout.fillWidth: Config.compactLayout
-    Layout.rightMargin: Kirigami.Units.largeSpacing
-    Layout.leftMargin: Kirigami.Units.largeSpacing
 
     persistentSelection: true
 
diff --git a/imports/NeoChat/Component/Timeline/TimelineContainer.qml b/imports/NeoChat/Component/Timeline/TimelineContainer.qml
index dc064a8d9..b9aa294b1 100644
--- a/imports/NeoChat/Component/Timeline/TimelineContainer.qml
+++ b/imports/NeoChat/Component/Timeline/TimelineContainer.qml
@@ -140,8 +140,8 @@ QQC2.ItemDelegate {
         id: bubble
         topPadding: Config.compactLayout ? Kirigami.Units.smallSpacing / 2 : Kirigami.Units.largeSpacing
         bottomPadding: Config.compactLayout ? Kirigami.Units.mediumSpacing / 2 : Kirigami.Units.largeSpacing
-        leftPadding: Kirigami.Units.smallSpacing
-        rightPadding: Config.compactLayout ? Kirigami.Units.largeSpacing : Kirigami.Units.smallSpacing
+        leftPadding: Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing
+        rightPadding: Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing
         hoverEnabled: true
 
         anchors {
@@ -182,14 +182,12 @@ QQC2.ItemDelegate {
 
         contentItem: ColumnLayout {
             id: column
-            spacing: 0
+            spacing: Kirigami.Units.smallSpacing
             Item {
                 id: rowLayout
                 visible: model.showAuthor && !isEmote
                 Layout.fillWidth: true
-                Layout.leftMargin: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing : 0
-                Layout.rightMargin: Kirigami.Units.largeSpacing
-                Layout.preferredWidth: nameLabel.implicitWidth + timeLabel.implicitWidth + Kirigami.Units.largeSpacing * 2
+                Layout.preferredWidth: nameLabel.implicitWidth + timeLabel.implicitWidth
                 Layout.maximumWidth: contentMaxWidth
                 implicitHeight: visible ? nameLabel.implicitHeight : 0
 
@@ -222,7 +220,6 @@ QQC2.ItemDelegate {
                 QQC2.Label {
                     id: timeLabel
                     leftPadding: Kirigami.Units.largeSpacing
-                    rightPadding: Kirigami.Units.largeSpacing
                     anchors.left: nameLabel.right
                     visible: model.showAuthor && !isEmote
                     text: visible ? time.toLocaleTimeString(Qt.locale(), Locale.ShortFormat) : ""
@@ -241,9 +238,6 @@ QQC2.ItemDelegate {
                 active: model.reply !== undefined
                 source: 'qrc:imports/NeoChat/Component/Timeline/ReplyComponent.qml'
                 visible: active
-                Layout.topMargin: Kirigami.Units.smallSpacing
-                Layout.bottomMargin: Config.compactLayout ? 0 : Kirigami.Units.smallSpacing
-                Layout.leftMargin: Config.compactLayout ? 0 : Kirigami.Units.largeSpacing
 
                 Connections {
                     target: replyLoader.item