diff --git a/bar.go b/bar.go index d0bc857..c7175a1 100644 --- a/bar.go +++ b/bar.go @@ -416,7 +416,7 @@ func (b *Bar) render(tw int) { fn := func(s *bState) { frame := new(renderFrame) - stat := newStatistics(tw, s) + stat := s.newStatistics(tw) r, err := s.draw(stat) if err != nil { for _, buf := range s.buffers { @@ -615,7 +615,7 @@ } } -func newStatistics(tw int, s *bState) decor.Statistics { +func (s bState) newStatistics(tw int) decor.Statistics { return decor.Statistics{ AvailableWidth: tw, RequestedWidth: s.reqWidth, diff --git a/draw_test.go b/draw_test.go index cf3a79d..eab5751 100644 --- a/draw_test.go +++ b/draw_test.go @@ -786,7 +786,7 @@ s.current = tc.current s.trimSpace = tc.trim s.refill = tc.refill - r, err := s.draw(newStatistics(tw, s)) + r, err := s.draw(s.newStatistics(tw)) if err != nil { t.Fatalf("tw: %d case %q draw error: %s", tw, tc.name, err.Error()) } @@ -1238,7 +1238,7 @@ s.current = tc.current s.trimSpace = tc.trim s.refill = tc.refill - r, err := s.draw(newStatistics(tw, s)) + r, err := s.draw(s.newStatistics(tw)) if err != nil { t.Fatalf("tw: %d case %q draw error: %s", tw, tc.name, err.Error()) } @@ -1413,7 +1413,7 @@ s.current = tc.current s.trimSpace = tc.trim s.refill = tc.refill - r, err := s.draw(newStatistics(tw, s)) + r, err := s.draw(s.newStatistics(tw)) if err != nil { t.Fatalf("tw: %d case %q draw error: %s", tw, tc.name, err.Error()) }