From c374ac77d5c6130211d162f44063a90896524118 Mon Sep 17 00:00:00 2001
From: Abdelilah El Aissaoui <aeab13@gmail.com>
Date: Fri, 11 Feb 2022 20:34:13 +0100
Subject: [PATCH] Fixed weird spacing when using fonts with different heights
 in lines with empty text in the diff

---
 src/main/kotlin/app/ui/Diff.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/app/ui/Diff.kt b/src/main/kotlin/app/ui/Diff.kt
index 18883fd..1ab2478 100644
--- a/src/main/kotlin/app/ui/Diff.kt
+++ b/src/main/kotlin/app/ui/Diff.kt
@@ -290,6 +290,7 @@ fun DiffLine(highestLineNumberLength: Int, line: Line) {
     Row(
         modifier = Modifier
             .background(backgroundColor)
+            .height(IntrinsicSize.Min)
     ) {
         val oldLineText = if (line.lineType == LineType.REMOVED || line.lineType == LineType.CONTEXT) {
             formattedLineNumber(line.displayOldLineNumber, highestLineNumberLength)
@@ -315,7 +316,7 @@ fun DiffLine(highestLineNumberLength: Int, line: Line) {
             text = line.text,
             modifier = Modifier
                 .padding(start = 8.dp)
-                .fillMaxWidth(),
+                .fillMaxSize(),
             color = MaterialTheme.colors.primaryTextColor,
             maxLines = 1,
             fontFamily = FontFamily.Monospace,
@@ -331,6 +332,7 @@ fun LineNumber(text: String) {
         color = MaterialTheme.colors.primaryTextColor,
         modifier = Modifier
             .background(MaterialTheme.colors.surface)
+            .fillMaxHeight()
             .padding(horizontal = 4.dp),
         fontFamily = FontFamily.Monospace,
         fontSize = 13.sp,