From 240cf6a0edbe6a10d7e519e2a309b0180eb087fa Mon Sep 17 00:00:00 2001
From: Thiago Sueto <herzenschein@gmail.com>
Date: Sun, 17 Nov 2024 18:47:45 +0000
Subject: [PATCH] Make height of chatbar, userinfo bar and side tab bar the
 same

|Current state|With this MR|
|-|-|
|![Screenshot_20241115_171736](/uploads/858a8ca21a6f4024a20f6ba32225aece/Screenshot_20241115_171736.png)|![Screenshot_20241115_171650](/uploads/115f99c7bb2b93a542c42647f9cc25c7/Screenshot_20241115_171650.png)|
---
 src/chatbar/ChatBar.qml | 13 ++++++-------
 src/qml/UserInfo.qml    |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/chatbar/ChatBar.qml b/src/chatbar/ChatBar.qml
index 1161528b9..e75ba10e0 100644
--- a/src/chatbar/ChatBar.qml
+++ b/src/chatbar/ChatBar.qml
@@ -176,13 +176,14 @@ QQC2.Control {
         RowLayout {
             QQC2.ScrollView {
                 id: chatBarScrollView
+                Layout.topMargin: Kirigami.Units.smallSpacing
+                Layout.bottomMargin: Kirigami.Units.smallSpacing
+                Layout.leftMargin: Kirigami.Units.largeSpacing
+                Layout.rightMargin: Kirigami.Units.largeSpacing
 
                 Layout.fillWidth: true
                 Layout.maximumHeight: Kirigami.Units.gridUnit * 8
-
-                Layout.topMargin: Kirigami.Units.smallSpacing
-                Layout.bottomMargin: Kirigami.Units.smallSpacing
-                Layout.minimumHeight: Kirigami.Units.gridUnit * 2
+                Layout.minimumHeight: Kirigami.Units.gridUnit * 3
 
                 // HACK: This is to stop the ScrollBar flickering on and off as the height is increased
                 QQC2.ScrollBar.vertical.policy: chatBarHeightAnimation.running && implicitHeight <= height ? QQC2.ScrollBar.AlwaysOff : QQC2.ScrollBar.AsNeeded
@@ -320,12 +321,11 @@ QQC2.Control {
                 id: actionsRow
                 spacing: 0
                 Layout.alignment: Qt.AlignBottom
-                Layout.bottomMargin: Kirigami.Units.smallSpacing * 1.5
+                Layout.bottomMargin: Kirigami.Units.smallSpacing * 4
 
                 Repeater {
                     model: root.actions
                     delegate: QQC2.ToolButton {
-                        Layout.alignment: Qt.AlignVCenter
                         icon.name: modelData.isBusy ? "" : (modelData.icon.name.length > 0 ? modelData.icon.name : modelData.icon.source)
                         onClicked: modelData.trigger()
 
@@ -342,7 +342,6 @@ QQC2.Control {
             }
         }
     }
-
     DelegateSizeHelper {
         id: chatBarSizeHelper
         startBreakpoint: Kirigami.Units.gridUnit * 46
diff --git a/src/qml/UserInfo.qml b/src/qml/UserInfo.qml
index 2c36ff25b..f1b124e58 100644
--- a/src/qml/UserInfo.qml
+++ b/src/qml/UserInfo.qml
@@ -27,7 +27,7 @@ RowLayout {
     Layout.topMargin: Kirigami.Units.smallSpacing
     Layout.bottomMargin: Kirigami.Units.smallSpacing
     Layout.rightMargin: Kirigami.Units.largeSpacing
-    Layout.minimumHeight: bottomEdge ? Kirigami.Units.gridUnit * 2 : -1
+    Layout.minimumHeight: bottomEdge ? Kirigami.Units.gridUnit * 3 : -1
 
     onVisibleChanged: {
         if (!visible) {