From 759d30014b2b67a2c9300605377e4521c882c378 Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Mon, 7 Feb 2022 15:37:14 +0100 Subject: [PATCH] Fixed context menu not working when clicking on the graph --- src/main/kotlin/app/ui/log/Log.kt | 66 +++++++++++++++---------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/src/main/kotlin/app/ui/log/Log.kt b/src/main/kotlin/app/ui/log/Log.kt index 37a7a85..1cef94a 100644 --- a/src/main/kotlin/app/ui/log/Log.kt +++ b/src/main/kotlin/app/ui/log/Log.kt @@ -526,41 +526,41 @@ fun CommitLine( ) { val commitRefs = graphNode.refs - Box(modifier = Modifier - .clickable { - onRevCommitSelected(graphNode) - } - .padding(start = graphWidth + PADDING_BETWEEN_DIVIDER_AND_MESSAGE.dp) - ) { - ContextMenuArea( - items = { - listOf( - ContextMenuItem( - label = "Checkout commit", - onClick = { logViewModel.checkoutCommit(graphNode) }), - ContextMenuItem( - label = "Create branch", - onClick = showCreateNewBranch - ), - ContextMenuItem( - label = "Create tag", - onClick = showCreateNewTag - ), - ContextMenuItem( - label = "Revert commit", - onClick = { logViewModel.revertCommit(graphNode) } - ), - ContextMenuItem( - label = "Cherry-pick commit", - onClick = { logViewModel.cherrypickCommit(graphNode) } - ), + ContextMenuArea( + items = { + listOf( + ContextMenuItem( + label = "Checkout commit", + onClick = { logViewModel.checkoutCommit(graphNode) }), + ContextMenuItem( + label = "Create branch", + onClick = showCreateNewBranch + ), + ContextMenuItem( + label = "Create tag", + onClick = showCreateNewTag + ), + ContextMenuItem( + label = "Revert commit", + onClick = { logViewModel.revertCommit(graphNode) } + ), + ContextMenuItem( + label = "Cherry-pick commit", + onClick = { logViewModel.cherrypickCommit(graphNode) } + ), - ContextMenuItem( - label = "Reset current branch to this commit", - onClick = { resetBranch(graphNode) } - ) + ContextMenuItem( + label = "Reset current branch to this commit", + onClick = { resetBranch(graphNode) } ) - }, + ) + }, + ) { + Box(modifier = Modifier + .clickable { + onRevCommitSelected(graphNode) + } + .padding(start = graphWidth + PADDING_BETWEEN_DIVIDER_AND_MESSAGE.dp) ) { Row( modifier = Modifier