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

Clean up TextWidget by simplifying the view creation

This commit is contained in:
Chris Cummer
2019-04-23 19:59:51 -07:00
parent eef8015158
commit f60ce6967d
2 changed files with 21 additions and 17 deletions

View File

@@ -25,19 +25,12 @@ type TextWidget struct {
}
func NewTextWidget(app *tview.Application, commonSettings *cfg.Common, focusable bool) TextWidget {
configKey := commonSettings.ConfigKey
focusChar := string('0' + commonSettings.FocusChar)
if commonSettings.FocusChar == -1 {
focusChar = ""
}
widget := TextWidget{
CommonSettings: commonSettings,
enabled: commonSettings.Enabled,
focusable: focusable,
focusChar: focusChar,
focusChar: commonSettings.FocusChar(),
key: commonSettings.ConfigKey,
name: commonSettings.Name,
refreshInterval: commonSettings.RefreshInterval,
@@ -50,7 +43,11 @@ func NewTextWidget(app *tview.Application, commonSettings *cfg.Common, focusable
commonSettings.Position.Height,
)
widget.addView(app, configKey)
widget.View = widget.addView()
widget.View.SetChangedFunc(func() {
app.Draw()
})
return widget
}
@@ -125,7 +122,7 @@ func (widget *TextWidget) TextView() *tview.TextView {
/* -------------------- Unexported Functions -------------------- */
func (widget *TextWidget) addView(app *tview.Application, configKey string) {
func (widget *TextWidget) addView() *tview.TextView {
view := tview.NewTextView()
view.SetBackgroundColor(ColorFor(widget.CommonSettings.Colors.Background))
@@ -138,9 +135,5 @@ func (widget *TextWidget) addView(app *tview.Application, configKey string) {
view.SetTitle(widget.ContextualTitle(widget.CommonSettings.Title))
view.SetWrap(false)
view.SetChangedFunc(func() {
app.Draw()
})
widget.View = view
return view
}