Fixed context menu not working when clicking on the graph

This commit is contained in:
Abdelilah El Aissaoui 2022-02-07 15:37:14 +01:00
parent 7e86e3b2fd
commit 759d30014b

View File

@ -526,41 +526,41 @@ fun CommitLine(
) { ) {
val commitRefs = graphNode.refs val commitRefs = graphNode.refs
Box(modifier = Modifier ContextMenuArea(
.clickable { items = {
onRevCommitSelected(graphNode) listOf(
} ContextMenuItem(
.padding(start = graphWidth + PADDING_BETWEEN_DIVIDER_AND_MESSAGE.dp) label = "Checkout commit",
) { onClick = { logViewModel.checkoutCommit(graphNode) }),
ContextMenuArea( ContextMenuItem(
items = { label = "Create branch",
listOf( onClick = showCreateNewBranch
ContextMenuItem( ),
label = "Checkout commit", ContextMenuItem(
onClick = { logViewModel.checkoutCommit(graphNode) }), label = "Create tag",
ContextMenuItem( onClick = showCreateNewTag
label = "Create branch", ),
onClick = showCreateNewBranch ContextMenuItem(
), label = "Revert commit",
ContextMenuItem( onClick = { logViewModel.revertCommit(graphNode) }
label = "Create tag", ),
onClick = showCreateNewTag ContextMenuItem(
), label = "Cherry-pick commit",
ContextMenuItem( onClick = { logViewModel.cherrypickCommit(graphNode) }
label = "Revert commit", ),
onClick = { logViewModel.revertCommit(graphNode) }
),
ContextMenuItem(
label = "Cherry-pick commit",
onClick = { logViewModel.cherrypickCommit(graphNode) }
),
ContextMenuItem( ContextMenuItem(
label = "Reset current branch to this commit", label = "Reset current branch to this commit",
onClick = { resetBranch(graphNode) } onClick = { resetBranch(graphNode) }
)
) )
}, )
},
) {
Box(modifier = Modifier
.clickable {
onRevCommitSelected(graphNode)
}
.padding(start = graphWidth + PADDING_BETWEEN_DIVIDER_AND_MESSAGE.dp)
) { ) {
Row( Row(
modifier = Modifier modifier = Modifier