From 997972a3d321703aa8701ad718c240e4aae42e72 Mon Sep 17 00:00:00 2001
From: Arnav Rawat <rawat.arnav@protonmail.com>
Date: Mon, 29 Mar 2021 21:45:36 +0000
Subject: [PATCH] Use Layout margins consistently Fixes #319, #320 - caused by
 inconsistent usage of layout margins on

---
 imports/NeoChat/Component/Timeline/TimelineContainer.qml | 2 +-
 imports/NeoChat/Page/RoomPage.qml                        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/imports/NeoChat/Component/Timeline/TimelineContainer.qml b/imports/NeoChat/Component/Timeline/TimelineContainer.qml
index cfe2436af..02c431ebd 100644
--- a/imports/NeoChat/Component/Timeline/TimelineContainer.qml
+++ b/imports/NeoChat/Component/Timeline/TimelineContainer.qml
@@ -149,7 +149,7 @@ Item {
             QQC2.ItemDelegate {
                 id: controlContainer
                 Layout.maximumWidth: mainColumn.width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 2
-                implicitHeight: contentItem.implicitHeight
+                implicitHeight: contentItem.implicitHeight + topPadding
                 topPadding: Kirigami.Units.largeSpacing
                 bottomPadding: 0
                 leftPadding: 0
diff --git a/imports/NeoChat/Page/RoomPage.qml b/imports/NeoChat/Page/RoomPage.qml
index c9500682b..1e2a0ffcf 100644
--- a/imports/NeoChat/Page/RoomPage.qml
+++ b/imports/NeoChat/Page/RoomPage.qml
@@ -394,7 +394,7 @@ Kirigami.ScrollablePage {
                     innerObject: TextDelegate {
                         Layout.fillWidth: true
                         Layout.rightMargin: Kirigami.Units.largeSpacing
-                        Layout.bottomMargin: Kirigami.Units.largeSpacing * 2
+                        Layout.bottomMargin: Kirigami.Units.largeSpacing
                         Layout.leftMargin: Kirigami.Units.largeSpacing
                         TapHandler {
                             acceptedButtons: Qt.RightButton
@@ -438,6 +438,7 @@ Kirigami.ScrollablePage {
                     innerObject: ImageDelegate {
                         Layout.minimumWidth: Kirigami.Units.gridUnit * 10
                         Layout.fillWidth: true
+                        Layout.bottomMargin: Kirigami.Units.largeSpacing
                         Layout.preferredHeight: info.h / info.w * width
                         Layout.maximumHeight: Kirigami.Units.gridUnit * 15
                         Layout.maximumWidth: Kirigami.Units.gridUnit * 30