utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-10 07:36:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the expanded layout of the branches panel (half and full screen modes)

Browse source 
If the showDivergenceFromBaseBranch config is not none, the expanded branches
panel would no longer show the remote branch and subject; the reason was that we
padded the name all the way to the right edge of the view so that the divergence
information is right-aligned.

To fix this, we simply don't right-align the divergence in half or full screen
mode. This is a bit unfortunate, but it's hard to do any better, because we
don't know the width of our column in advance. One thing I tried is to make the
divergence a separate column in that case (with an explicit right-alignment set
on it via getColumnAlignments; however, this makes it harder to properly
truncate the name when the window is too narrow.
This commit is contained in:
Stefan Haller 2026-03-23 17:22:22 +01:00
parent 24158aa6d0
commit d9487bf31c
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/gui/presentation/branches.go
View file

@ -145,7 +145,13 @@ func getBranchDisplayStrings(
}
if divergence != "" {
paddingNeededForDivergence -= utils.StringWidth(utils.Decolorise(coloredName)) - 1
if fullDescription {
// don't right-align the divergence in half or full screen mode, since other fields
// follow in that case and we don't know the width of our column
paddingNeededForDivergence = 1
} else {
paddingNeededForDivergence -= utils.StringWidth(utils.Decolorise(coloredName)) - 1
}
if paddingNeededForDivergence > 0 {
coloredName += strings.Repeat(" ", paddingNeededForDivergence)
coloredName += style.FgCyan.Sprint(divergence)