luisgulo/Gitnuro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved menu bar

Browse source
This commit is contained in:
Abdelilah El Aissaoui 2022-10-27 20:05:45 +02:00
parent bf6afc82c6
commit b4c304371c
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/main/kotlin/com/jetpackduba/gitnuro/ui/Menu.kt
View file

@ -92,12 +92,12 @@ fun Menu(
onCreateBranch()
}
MenuButton(
title = "Merge",
icon = painterResource("merge.svg"),
) {
onCreateBranch()
}
// MenuButton(
// title = "Merge",
// icon = painterResource("merge.svg"),
// ) {
// onCreateBranch()
// }
Spacer(modifier = Modifier.width(32.dp))
@ -164,14 +164,14 @@ fun MenuButton(
contentDescription = title,
modifier = Modifier
.size(24.dp),
tint = MaterialTheme.colors.onPrimary,
tint = MaterialTheme.colors.onBackground,
)
Text(
text = title,
style = MaterialTheme.typography.caption,
maxLines = 1,
textAlign = TextAlign.Center,
color = MaterialTheme.colors.onPrimary,
color = MaterialTheme.colors.onBackground,
)
}
}
@ -193,6 +193,9 @@ fun ExtendedMenuButton(
.ignoreKeyEvents()
.clip(RoundedCornerShape(4.dp))
.background(MaterialTheme.colors.surface)
.handMouseClickable {
showDropDownMenu = true
}
) {
Column(
modifier = Modifier
@ -207,12 +210,12 @@ fun ExtendedMenuButton(
contentDescription = title,
modifier = Modifier
.size(24.dp),
tint = MaterialTheme.colors.onPrimary,
tint = MaterialTheme.colors.onBackground,
)
Text(
text = title,
style = MaterialTheme.typography.caption,
color = MaterialTheme.colors.onPrimary,
color = MaterialTheme.colors.onBackground,
maxLines = 1,
)
}
@ -220,17 +223,14 @@ fun ExtendedMenuButton(
Box(
modifier = Modifier
.fillMaxHeight()
.ignoreKeyEvents()
.handMouseClickable {
showDropDownMenu = true
},
.ignoreKeyEvents(),
contentAlignment = Alignment.Center,
) {
Icon(
painterResource("expand_more.svg"),
contentDescription = null,
tint = MaterialTheme.colors.onPrimary,
tint = MaterialTheme.colors.onBackground,
modifier = Modifier.size(16.dp)
)