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

Fixed padding of merge/rebase buttons when having conflicts

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2022-06-17 17:45:40 +02:00
parent 86a7f85e74
commit ca32f7c551
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/kotlin/app/ui/UncommitedChanges.kt
View File

@ -167,8 +167,6 @@ fun UncommitedChanges(
.height(192.dp) .height(192.dp)
.fillMaxWidth() .fillMaxWidth()
) { ) {
// Don't show the message TextField when rebasing as it can't be edited
TextField( TextField(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
@ -297,7 +295,7 @@ fun MergeButtons(
AbortButton( AbortButton(
modifier = Modifier modifier = Modifier
.weight(1f) .weight(1f)
.padding(start = 8.dp, end = 4.dp), .padding(end = 4.dp),
onClick = onAbort onClick = onAbort
) )
@ -305,7 +303,7 @@ fun MergeButtons(
text = "Merge", text = "Merge",
modifier = Modifier modifier = Modifier
.weight(1f) .weight(1f)
.padding(start = 8.dp, end = 4.dp), .padding(start = 4.dp),
enabled = haveConflictsBeenSolved, enabled = haveConflictsBeenSolved,
onClick = onMerge, onClick = onMerge,
) )
@ -326,7 +324,7 @@ fun RebasingButtons(
AbortButton( AbortButton(
modifier = Modifier modifier = Modifier
.weight(1f) .weight(1f)
.padding(start = 8.dp, end = 4.dp), .padding(end = 4.dp),
onClick = onAbort onClick = onAbort
) )
@ -335,7 +333,7 @@ fun RebasingButtons(
text = "Continue", text = "Continue",
modifier = Modifier modifier = Modifier
.weight(1f) .weight(1f)
.padding(start = 8.dp, end = 4.dp), .padding(start = 4.dp),
enabled = haveConflictsBeenSolved, enabled = haveConflictsBeenSolved,
onClick = onContinue, onClick = onContinue,
) )
@ -344,7 +342,7 @@ fun RebasingButtons(
text = "Skip", text = "Skip",
modifier = Modifier modifier = Modifier
.weight(1f) .weight(1f)
.padding(start = 8.dp, end = 4.dp), .padding(end = 4.dp),
onClick = onSkip, onClick = onSkip,
) )
} }