Maks1mS/bubbles
1
0
Fork 0
mirror of https://github.com/Maks1mS/bubbles.git synced 2025-04-04 22:43:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Doc comments, optimizations, and magic number removal

Browse Source
This commit is contained in:
Christian Rocha 2020-11-18 18:17:27 -05:00 committed by Christian Rocha
parent b78277e7ec
commit 47b8d9c6a8
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
progress/example/main.go
View File

@ -11,7 +11,8 @@ import (
) )
const ( const (
stepSize float64 = 1.0 / (60.0 * 2.0) fps = 60
stepSize float64 = 1.0 / (float64(fps) * 2.0)
padding = 2 padding = 2
maxWidth = 80 maxWidth = 80
) )
@ -75,7 +76,7 @@ func (e example) View() string {
} }
func tickCmd() tea.Cmd { func tickCmd() tea.Cmd {
return tea.Tick(time.Second/60, func(t time.Time) tea.Msg { return tea.Tick(time.Second/fps, func(t time.Time) tea.Msg {
return tickMsg(t) return tickMsg(t)
}) })
} }

15
progress/progress.go
View File

@ -60,6 +60,7 @@ func WithoutPercentage() Option {
} }
} }
// Model stores values we'll use when rendering the progress bar.
type Model struct { type Model struct {
// Total width of the progress bar, including percentage, if set. // Total width of the progress bar, including percentage, if set.
@ -106,18 +107,22 @@ func NewModel(opts ...Option) *Model {
return m return m
} }
// view renders the progress bar as a given percentage.
func (m Model) View(percent float64) string { func (m Model) View(percent float64) string {
b := strings.Builder{}
if m.ShowPercentage { if m.ShowPercentage {
s := fmt.Sprintf(m.PercentFormat, percent*100) s := fmt.Sprintf(m.PercentFormat, percent*100)
w := ansi.PrintableRuneWidth(s) w := ansi.PrintableRuneWidth(s)
return m.bar(percent, w) + s m.bar(&b, percent, w)
b.WriteString(s)
} else {
m.bar(&b, percent, 0)
} }
return m.bar(percent, 0) return b.String()
} }
func (m Model) bar(percent float64, textWidth int) string { func (m Model) bar(b *strings.Builder, percent float64, textWidth int) {
var ( var (
b = strings.Builder{}
tw = m.Width - textWidth // total width tw = m.Width - textWidth // total width
fw = int(float64(tw) * percent) // filled width fw = int(float64(tw) * percent) // filled width
p float64 p float64
@ -147,8 +152,6 @@ func (m Model) bar(percent float64, textWidth int) string {
// Empty fill // Empty fill
e := termenv.String(string(m.Empty)).Foreground(color(m.EmptyColor)).String() e := termenv.String(string(m.Empty)).Foreground(color(m.EmptyColor)).String()
b.WriteString(strings.Repeat(e, tw-fw)) b.WriteString(strings.Repeat(e, tw-fw))
return b.String()
} }
func (m *Model) setRamp(colorA, colorB string, scaled bool) { func (m *Model) setRamp(colorA, colorB string, scaled bool) {