Preston_PLB
/
bubbletea
forked from Mirrors/bubbletea
1
0
Fork 0
Code Pull Requests Activity

Remove an extraneous var and rename another var for clarity

This commit is contained in:
Christian Rocha 2020-05-28 10:26:03 -04:00
parent 99df3d4226
commit e7130c9633
No known key found for this signature in database
GPG Key ID: D6CC7A16E5878018
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tea.go
View File

@ -47,9 +47,8 @@ type Program struct {
update Update update Update
view View view View
mutex sync.Mutex mutex sync.Mutex
linesRendered int currentRender string
contentRendered string
} }
// Quit is a command that tells the program to exit. // Quit is a command that tells the program to exit.
@ -163,11 +162,12 @@ func (p *Program) render(model Model) {
view := p.view(model) view := p.view(model)
// The view hasn't changed; no need to render // The view hasn't changed; no need to render
if view == p.contentRendered { if view == p.currentRender {
return return
} }
p.contentRendered = view p.currentRender = view
linesRendered := strings.Count(p.currentRender, "\r\n")
// Add carriage returns to ensure that the cursor travels to the start of a // Add carriage returns to ensure that the cursor travels to the start of a
// column after a newline. Keep in mind that this means that in the rest // column after a newline. Keep in mind that this means that in the rest
@ -175,13 +175,11 @@ func (p *Program) render(model Model) {
view = strings.Replace(view, "\n", "\r\n", -1) view = strings.Replace(view, "\n", "\r\n", -1)
p.mutex.Lock() p.mutex.Lock()
if p.linesRendered > 0 { if linesRendered > 0 {
termenv.ClearLines(p.linesRendered) termenv.ClearLines(linesRendered)
} }
_, _ = io.WriteString(os.Stdout, view) _, _ = io.WriteString(os.Stdout, view)
p.mutex.Unlock() p.mutex.Unlock()
p.linesRendered = strings.Count(view, "\r\n")
} }
// AltScreen exits the altscreen. This is just a wrapper around the termenv // AltScreen exits the altscreen. This is just a wrapper around the termenv