From 04babdfb82540c5ea889110400a6e494ae117ab6 Mon Sep 17 00:00:00 2001 From: Ryooooooga Date: Sat, 7 May 2022 17:10:38 +0900 Subject: [PATCH] fix: fix the appStatus width calculation --- pkg/gui/arrangement.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/gui/arrangement.go b/pkg/gui/arrangement.go index 003156dbb..d0e4c7fd0 100644 --- a/pkg/gui/arrangement.go +++ b/pkg/gui/arrangement.go @@ -5,6 +5,7 @@ import ( "github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" + "github.com/mattn/go-runewidth" ) // In this file we use the boxlayout package, along with knowledge about the app's state, @@ -78,7 +79,7 @@ func (gui *Gui) infoSectionChildren(informationStr string, appStatus string) []* return []*boxlayout.Box{ { Window: "searchPrefix", - Size: len(SEARCH_PREFIX), + Size: runewidth.StringWidth(SEARCH_PREFIX), }, { Window: "search", @@ -93,7 +94,7 @@ func (gui *Gui) infoSectionChildren(informationStr string, appStatus string) []* result = append(result, &boxlayout.Box{ Window: "appStatus", - Size: len(appStatus) + len(INFO_SECTION_PADDING), + Size: runewidth.StringWidth(appStatus) + runewidth.StringWidth(INFO_SECTION_PADDING), }, ) } @@ -107,7 +108,7 @@ func (gui *Gui) infoSectionChildren(informationStr string, appStatus string) []* { Window: "information", // unlike appStatus, informationStr has various colors so we need to decolorise before taking the length - Size: len(INFO_SECTION_PADDING) + len(utils.Decolorise(informationStr)), + Size: runewidth.StringWidth(INFO_SECTION_PADDING) + runewidth.StringWidth(utils.Decolorise(informationStr)), }, }..., )