Fixed paddings around the menu bar
This commit is contained in:
parent
71c639b6a3
commit
878f6704d6
@ -29,6 +29,7 @@ import app.viewmodels.MenuViewModel
|
|||||||
// TODO Add tooltips to all the buttons
|
// TODO Add tooltips to all the buttons
|
||||||
@Composable
|
@Composable
|
||||||
fun Menu(
|
fun Menu(
|
||||||
|
modifier: Modifier,
|
||||||
menuViewModel: MenuViewModel,
|
menuViewModel: MenuViewModel,
|
||||||
onRepositoryOpen: () -> Unit,
|
onRepositoryOpen: () -> Unit,
|
||||||
onCreateBranch: () -> Unit,
|
onCreateBranch: () -> Unit,
|
||||||
@ -37,10 +38,9 @@ fun Menu(
|
|||||||
var showAdditionalOptionsDropDownMenu by remember { mutableStateOf(false) }
|
var showAdditionalOptionsDropDownMenu by remember { mutableStateOf(false) }
|
||||||
|
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier
|
modifier = modifier,
|
||||||
.padding(vertical = 4.dp)
|
|
||||||
.fillMaxWidth(),
|
|
||||||
horizontalArrangement = Arrangement.Center,
|
horizontalArrangement = Arrangement.Center,
|
||||||
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
) {
|
) {
|
||||||
MenuButton(
|
MenuButton(
|
||||||
modifier = Modifier.padding(start = 8.dp),
|
modifier = Modifier.padding(start = 8.dp),
|
||||||
@ -115,7 +115,8 @@ fun Menu(
|
|||||||
Box {
|
Box {
|
||||||
IconMenuButton(
|
IconMenuButton(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.padding(end = 8.dp),
|
.padding(end = 8.dp)
|
||||||
|
.size(36.dp),
|
||||||
icon = painterResource("more_vert.svg"),
|
icon = painterResource("more_vert.svg"),
|
||||||
onClick = {
|
onClick = {
|
||||||
showAdditionalOptionsDropDownMenu = true
|
showAdditionalOptionsDropDownMenu = true
|
||||||
|
@ -80,6 +80,9 @@ fun RepositoryOpenPage(tabViewModel: TabViewModel) {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Menu(
|
Menu(
|
||||||
|
modifier = Modifier
|
||||||
|
.padding(top = 4.dp, bottom = 8.dp) // Linear progress bar already take 4 additional dp for top
|
||||||
|
.fillMaxWidth(),
|
||||||
menuViewModel = tabViewModel.menuViewModel,
|
menuViewModel = tabViewModel.menuViewModel,
|
||||||
onRepositoryOpen = {
|
onRepositoryOpen = {
|
||||||
openRepositoryDialog(tabViewModel = tabViewModel)
|
openRepositoryDialog(tabViewModel = tabViewModel)
|
||||||
|
Loading…
Reference in New Issue
Block a user