1
0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00

Fix race with HighlightableHelper

GetRect can lead to a race condition
Add a RenderFunc method so that we can call try to
wrap even more of our rendering in the thread safe
`QueueUpdateDraw` method
This commit is contained in:
Sean Smith
2019-08-24 22:05:37 -04:00
parent 3f5fe6f3e5
commit 264f49fd2c
12 changed files with 69 additions and 45 deletions

View File

@@ -91,8 +91,7 @@ func (widget *Widget) Render() {
return
}
title := widget.CommonSettings().Title
widget.Redraw(title, widget.contentFrom(widget.stories), false)
widget.RedrawFunc(widget.content)
}
/* -------------------- Unexported Functions -------------------- */
@@ -123,7 +122,9 @@ func (widget *Widget) fetchForFeed(feedURL string) ([]*FeedItem, error) {
return feedItems, nil
}
func (widget *Widget) contentFrom(data []*FeedItem) string {
func (widget *Widget) content() (string, string, bool) {
data := widget.stories
title := widget.CommonSettings().Title
var str string
for idx, feedItem := range data {
@@ -147,7 +148,7 @@ func (widget *Widget) contentFrom(data []*FeedItem) string {
str += utils.HighlightableHelper(widget.View, row, idx, len(feedItem.item.Title))
}
return str
return title, str, true
}
// feedItems are sorted by published date