Julian/Gitnuro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed graph not updating properly when switching branches

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2021-10-28 04:04:19 +02:00
parent 71bf75ceca
commit 61f0c00290
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/kotlin/app/ui/Log.kt
View File

@ -155,7 +155,7 @@ fun Log(
onUncommitedChangesSelected() onUncommitedChangesSelected()
}, },
) { ) {
val hasPreviousCommits = remember(commitList) { commitList.count() > 0 } val hasPreviousCommits = commitList.count() > 0
UncommitedChangesGraphLine( UncommitedChangesGraphLine(
modifier = Modifier modifier = Modifier
@ -282,7 +282,7 @@ fun Log(
dialogManager.show { dialogManager.show {
MergeDialog( MergeDialog(
currentBranchName = "HEAD", currentBranchName = "HEAD",
mergeBranchName = ref.name, mergeBranchName = ref.simpleName,
onReject = { onReject = {
dialogManager.dismiss() dialogManager.dismiss()
}, },
@ -401,12 +401,9 @@ fun CommitsGraphLine(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
plotCommit: GraphNode, plotCommit: GraphNode,
) { ) {
val passingLanes = remember(plotCommit) { val passingLanes = plotCommit.passingLanes
plotCommit.passingLanes val forkingOffLanes = plotCommit.forkingOffLanes
} val mergingLanes = plotCommit.mergingLanes
val forkingOffLanes = remember(plotCommit) { plotCommit.forkingOffLanes }
val mergingLanes = remember(plotCommit) { plotCommit.mergingLanes }
Box(modifier = modifier) { Box(modifier = modifier) {
Canvas( Canvas(