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

Fixed uncommited changes graph line not being drawn when having conflicts

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2022-10-23 18:01:23 +02:00
parent 90a516f5af
commit 2e0e616dc2
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt
View File

@ -162,6 +162,7 @@ fun Log(
commitList = commitList, commitList = commitList,
selectedCommit = selectedCommit, selectedCommit = selectedCommit,
selectedItem = selectedItem, selectedItem = selectedItem,
repositoryState = repositoryState,
horizontalScrollState = horizontalScrollState, horizontalScrollState = horizontalScrollState,
graphWidth = graphWidth, graphWidth = graphWidth,
verticalScrollState = verticalScrollState, verticalScrollState = verticalScrollState,
@ -434,6 +435,7 @@ fun GraphList(
selectedCommit: RevCommit?, selectedCommit: RevCommit?,
selectedItem: SelectedItem, selectedItem: SelectedItem,
commitsLimit: Int, commitsLimit: Int,
repositoryState: RepositoryState,
) { ) {
val maxLinePosition = if (commitList.isNotEmpty()) val maxLinePosition = if (commitList.isNotEmpty())
commitList.maxLine commitList.maxLine
@ -462,7 +464,12 @@ fun GraphList(
LazyColumn( LazyColumn(
state = verticalScrollState, modifier = Modifier.width(graphRealWidth) state = verticalScrollState, modifier = Modifier.width(graphRealWidth)
) { ) {
if (hasUncommitedChanges) { if (
hasUncommitedChanges ||
repositoryState.isMerging ||
repositoryState.isRebasing ||
repositoryState.isCherryPicking
) {
item { item {
Row( Row(
modifier = Modifier modifier = Modifier