mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-11-10 04:54:03 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: join segments when omitting diamonds

Browse source 
relates to #697
This commit is contained in:
Jan De Dobbeleer 2021-05-04 07:40:27 +02:00 committed by Jan De Dobbeleer
parent 248afec9fa
commit 3c5129275e
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/block.go
View file

@ -89,9 +89,10 @@ func (b *Block) renderSegments() string {
}
func (b *Block) endPowerline() {
if b.activeSegment != nil &&
b.activeSegment.Style != Powerline &&
b.previousActiveSegment != nil &&
if b.previousActiveSegment == nil || b.activeSegment == nil {
return
}
if b.activeSegment.Style != Powerline &&
b.previousActiveSegment.Style == Powerline {
b.writePowerLineSeparator(b.getPowerlineColor(false), b.previousActiveSegment.background(), true)
}
@ -113,6 +114,12 @@ func (b *Block) getPowerlineColor(foreground bool) string {
if b.previousActiveSegment == nil {
return Transparent
}
if b.previousActiveSegment.Style == Diamond && len(b.previousActiveSegment.TrailingDiamond) == 0 {
return b.previousActiveSegment.background()
}
if b.activeSegment.Style == Diamond && len(b.activeSegment.LeadingDiamond) == 0 {
return b.activeSegment.background()
}
if !foreground && b.activeSegment.Style != Powerline {
return Transparent
}