luisgulo/Gitnuro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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,
selectedCommit = selectedCommit,
selectedItem = selectedItem,
repositoryState = repositoryState,
horizontalScrollState = horizontalScrollState,
graphWidth = graphWidth,
verticalScrollState = verticalScrollState,
@ -434,6 +435,7 @@ fun GraphList(
selectedCommit: RevCommit?,
selectedItem: SelectedItem,
commitsLimit: Int,
repositoryState: RepositoryState,
) {
val maxLinePosition = if (commitList.isNotEmpty())
commitList.maxLine
@ -462,7 +464,12 @@ fun GraphList(
LazyColumn(
state = verticalScrollState, modifier = Modifier.width(graphRealWidth)
) {
if (hasUncommitedChanges) {
if (
hasUncommitedChanges ||
repositoryState.isMerging ||
repositoryState.isRebasing ||
repositoryState.isCherryPicking
) {
item {
Row(
modifier = Modifier