taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Fix race conditions caused by writing to view

Browse Source
This commit is contained in:
Chris Cummer
2019-04-24 23:53:31 -07:00
parent 388851f02d
commit b7be868798
6 changed files with 32 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/clocks/widget.go
View File

@@ -11,6 +11,7 @@ import (
type Widget struct {
wtf.TextWidget
app *tview.Application
clockColl ClockCollection
dateFormat string
timeFormat string
@@ -21,6 +22,7 @@ func NewWidget(app *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: wtf.NewTextWidget(app, settings.common, false),
app: app,
settings: settings,
dateFormat: settings.dateFormat,
timeFormat: settings.timeFormat,
@@ -34,7 +36,10 @@ func NewWidget(app *tview.Application, settings *Settings) *Widget {
/* -------------------- Exported Functions -------------------- */
func (widget *Widget) Refresh() {
widget.display(widget.clockColl.Sorted(widget.settings.sort), widget.dateFormat, widget.timeFormat)
widget.app.QueueUpdateDraw(func() {
sortedClocks := widget.clockColl.Sorted(widget.settings.sort)
widget.display(sortedClocks, widget.dateFormat, widget.timeFormat)
})
}
/* -------------------- Unexported Functions -------------------- */

6
modules/security/widget.go
View File

@@ -11,6 +11,7 @@ import (
type Widget struct {
wtf.TextWidget
app *tview.Application
settings *Settings
}
@@ -18,6 +19,7 @@ func NewWidget(app *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: wtf.NewTextWidget(app, settings.common, false),
app: app,
settings: settings,
}
@@ -35,7 +37,9 @@ func (widget *Widget) Refresh() {
data := NewSecurityData()
data.Fetch()
widget.View.SetText(widget.contentFrom(data))
widget.app.QueueUpdateDraw(func() {
widget.View.SetText(widget.contentFrom(data))
})
}
/* -------------------- Unexported Functions -------------------- */

12
modules/status/widget.go
View File

@@ -9,7 +9,9 @@ type Widget struct {
wtf.TextWidget
CurrentIcon int
settings *Settings
app *tview.Application
settings *Settings
}
func NewWidget(app *tview.Application, settings *Settings) *Widget {
@@ -17,7 +19,9 @@ func NewWidget(app *tview.Application, settings *Settings) *Widget {
TextWidget: wtf.NewTextWidget(app, settings.common, false),
CurrentIcon: 0,
settings: settings,
app: app,
settings: settings,
}
return &widget
@@ -26,7 +30,9 @@ func NewWidget(app *tview.Application, settings *Settings) *Widget {
/* -------------------- Exported Functions -------------------- */
func (widget *Widget) Refresh() {
widget.View.SetText(widget.animation())
widget.app.QueueUpdateDraw(func() {
widget.View.SetText(widget.animation())
})
}
/* -------------------- Unexported Functions -------------------- */

8
modules/todo/widget.go
View File

@@ -72,9 +72,12 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
func (widget *Widget) Refresh() {
widget.load()
widget.display()
widget.View.SetTitle(widget.ContextualTitle(widget.Name()))
widget.app.QueueUpdateDraw(func() {
widget.display()
widget.View.SetTitle(widget.ContextualTitle(widget.Name()))
})
}
func (widget *Widget) SetList(newList checklist.Checklist) {
@@ -265,6 +268,7 @@ func (widget *Widget) modalFocus(form *tview.Form) {
frame := widget.modalFrame(form)
widget.pages.AddPage("modal", frame, false, true)
widget.app.SetFocus(frame)
widget.app.Draw()
}
func (widget *Widget) modalForm(lbl, text string) *tview.Form {