diff --git a/bar_filler_bar.go b/bar_filler_bar.go index 8c7bc86..ae54192 100644 --- a/bar_filler_bar.go +++ b/bar_filler_bar.go @@ -114,7 +114,7 @@ } func (s *barFiller) Fill(w io.Writer, reqWidth int, stat decor.Statistics) { - width := internal.WidthForBarFiller(reqWidth, stat.AvailableWidth) + width := internal.CheckRequestedWidth(reqWidth, stat.AvailableWidth) brackets := s.rwidth[rLeft] + s.rwidth[rRight] if width < brackets { return diff --git a/bar_filler_spinner.go b/bar_filler_spinner.go index a1d0e12..0817b19 100644 --- a/bar_filler_spinner.go +++ b/bar_filler_spinner.go @@ -43,7 +43,7 @@ } func (s *spinnerFiller) Fill(w io.Writer, reqWidth int, stat decor.Statistics) { - width := internal.WidthForBarFiller(reqWidth, stat.AvailableWidth) + width := internal.CheckRequestedWidth(reqWidth, stat.AvailableWidth) frame := s.frames[s.count%uint(len(s.frames))] frameWidth := runewidth.StringWidth(frame) diff --git a/internal/width.go b/internal/width.go index 35d5289..216320f 100644 --- a/internal/width.go +++ b/internal/width.go @@ -1,8 +1,10 @@ package internal -func WidthForBarFiller(reqWidth, available int) int { - if reqWidth <= 0 || reqWidth >= available { +// CheckRequestedWidth checks that requested width doesn't overflow +// available width +func CheckRequestedWidth(requested, available int) int { + if requested <= 0 || requested >= available { return available } - return reqWidth + return requested }