From 6901bf9f1cce0b3b0839fa71ba6cad83f25de6f5 Mon Sep 17 00:00:00 2001
From: Abdelilah El Aissaoui <aeab13@gmail.com>
Date: Mon, 6 Jun 2022 12:52:56 +0200
Subject: [PATCH] Fixed menu padding missalignments

---
 src/main/kotlin/app/ui/Menu.kt | 55 ++++++++++++++++------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/main/kotlin/app/ui/Menu.kt b/src/main/kotlin/app/ui/Menu.kt
index e68a994..e7d694e 100644
--- a/src/main/kotlin/app/ui/Menu.kt
+++ b/src/main/kotlin/app/ui/Menu.kt
@@ -53,6 +53,7 @@ fun Menu(
         Spacer(modifier = Modifier.weight(1f))
 
         ExtendedMenuButton(
+            modifier = Modifier.padding(end = 8.dp),
             title = "Pull",
             icon = painterResource("download.svg"),
             onClick = { menuViewModel.pull() },
@@ -80,7 +81,7 @@ fun Menu(
             )
         )
 
-        Spacer(modifier = Modifier.width(16.dp))
+        Spacer(modifier = Modifier.width(24.dp))
 
         MenuButton(
             title = "Branch",
@@ -90,9 +91,10 @@ fun Menu(
             },
         )
 
-        Spacer(modifier = Modifier.width(16.dp))
+        Spacer(modifier = Modifier.width(24.dp))
 
         MenuButton(
+            modifier = Modifier.padding(end = 8.dp),
             title = "Stash",
             icon = painterResource("stash.svg"),
             onClick = { menuViewModel.stash() },
@@ -153,9 +155,8 @@ fun MenuButton(
 
     Box(
         modifier = modifier
-            .padding(horizontal = 2.dp)
             .handMouseClickable { if (enabled) onClick() }
-            .border(ButtonDefaults.outlinedBorder, RoundedCornerShape(3.dp))
+            .border(ButtonDefaults.outlinedBorder, RoundedCornerShape(4.dp))
             .padding(vertical = 8.dp, horizontal = 16.dp),
     ) {
         Row(
@@ -196,39 +197,35 @@ fun ExtendedMenuButton(
 
     var showDropDownMenu by remember { mutableStateOf(false) }
 
-    Row(modifier = Modifier.height(IntrinsicSize.Min)) {
-        Box(
-            modifier = modifier
+    Row(modifier = modifier.height(IntrinsicSize.Min)) {
+        Row(
+            modifier = Modifier
                 .handMouseClickable { if (enabled) onClick() }
-                .border(ButtonDefaults.outlinedBorder, RoundedCornerShape(topStart = 3.dp, bottomStart = 3.dp))
+                .border(ButtonDefaults.outlinedBorder, RoundedCornerShape(topStart = 4.dp, bottomStart = 4.dp))
                 .padding(vertical = 8.dp, horizontal = 16.dp),
+            horizontalArrangement = Arrangement.Center,
+            verticalAlignment = Alignment.CenterVertically,
         ) {
-            Row(
-                horizontalArrangement = Arrangement.Center,
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Image(
-                    painter = icon,
-                    contentDescription = title,
-                    modifier = Modifier
-                        .padding(horizontal = 4.dp)
-                        .size(24.dp),
-                    colorFilter = ColorFilter.tint(iconColor),
-                )
-                Text(
-                    text = title,
-                    fontSize = 12.sp,
-                    color = MaterialTheme.colors.primaryTextColor
-                )
-            }
+            Image(
+                painter = icon,
+                contentDescription = title,
+                modifier = Modifier
+                    .padding(horizontal = 4.dp)
+                    .size(24.dp),
+                colorFilter = ColorFilter.tint(iconColor),
+            )
+            Text(
+                text = title,
+                fontSize = 12.sp,
+                color = MaterialTheme.colors.primaryTextColor
+            )
         }
 
         Box(
-            modifier = modifier
-                .padding(end = 8.dp)
+            modifier = Modifier
                 .width(20.dp)
                 .fillMaxHeight()
-                .border(ButtonDefaults.outlinedBorder, RoundedCornerShape(topEnd = 3.dp, bottomEnd = 3.dp))
+                .border(ButtonDefaults.outlinedBorder, RoundedCornerShape(topEnd = 4.dp, bottomEnd = 4.dp))
                 .handMouseClickable {
                     showDropDownMenu = true
                 },