From 878f6704d680a96953fdbcafeaff95daf617d7e6 Mon Sep 17 00:00:00 2001
From: Abdelilah El Aissaoui <aeab13@gmail.com>
Date: Sat, 11 Jun 2022 13:36:43 +0200
Subject: [PATCH] Fixed paddings around the menu bar

---
 src/main/kotlin/app/ui/Menu.kt           | 9 +++++----
 src/main/kotlin/app/ui/RepositoryOpen.kt | 3 +++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/app/ui/Menu.kt b/src/main/kotlin/app/ui/Menu.kt
index 7192c2a..766c6f0 100644
--- a/src/main/kotlin/app/ui/Menu.kt
+++ b/src/main/kotlin/app/ui/Menu.kt
@@ -29,6 +29,7 @@ import app.viewmodels.MenuViewModel
 // TODO Add tooltips to all the buttons
 @Composable
 fun Menu(
+    modifier: Modifier,
     menuViewModel: MenuViewModel,
     onRepositoryOpen: () -> Unit,
     onCreateBranch: () -> Unit,
@@ -37,10 +38,9 @@ fun Menu(
     var showAdditionalOptionsDropDownMenu by remember { mutableStateOf(false) }
 
     Row(
-        modifier = Modifier
-            .padding(vertical = 4.dp)
-            .fillMaxWidth(),
+        modifier = modifier,
         horizontalArrangement = Arrangement.Center,
+        verticalAlignment = Alignment.CenterVertically,
     ) {
         MenuButton(
             modifier = Modifier.padding(start = 8.dp),
@@ -115,7 +115,8 @@ fun Menu(
         Box {
             IconMenuButton(
                 modifier = Modifier
-                    .padding(end = 8.dp),
+                    .padding(end = 8.dp)
+                    .size(36.dp),
                 icon = painterResource("more_vert.svg"),
                 onClick = {
                     showAdditionalOptionsDropDownMenu = true
diff --git a/src/main/kotlin/app/ui/RepositoryOpen.kt b/src/main/kotlin/app/ui/RepositoryOpen.kt
index 6ef2874..cc193c4 100644
--- a/src/main/kotlin/app/ui/RepositoryOpen.kt
+++ b/src/main/kotlin/app/ui/RepositoryOpen.kt
@@ -80,6 +80,9 @@ fun RepositoryOpenPage(tabViewModel: TabViewModel) {
             }
         } else {
             Menu(
+                modifier = Modifier
+                    .padding(top = 4.dp, bottom = 8.dp) // Linear progress bar already take 4 additional dp for top
+                    .fillMaxWidth(),
                 menuViewModel = tabViewModel.menuViewModel,
                 onRepositoryOpen = {
                     openRepositoryDialog(tabViewModel = tabViewModel)