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

Create abtract scrollable widget

Browse Source 
This cleans up a bunch of boilerplate for scrollable items and standardizes their usage
This commit is contained in:
Sean Smith
2019-05-09 22:43:01 -04:00
parent 0b59a3b62f
commit 210723cd74
17 changed files with 232 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gitter/keyboard.go
View File

@@ -4,11 +4,11 @@ import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() {
widget.SetKeyboardChar("/", widget.ShowHelp)
widget.SetKeyboardChar("j", widget.next)
widget.SetKeyboardChar("k", widget.prev)
widget.SetKeyboardChar("j", widget.Next)
widget.SetKeyboardChar("k", widget.Prev)
widget.SetKeyboardChar("r", widget.Refresh)
widget.SetKeyboardKey(tcell.KeyDown, widget.next)
widget.SetKeyboardKey(tcell.KeyEsc, widget.unselect)
widget.SetKeyboardKey(tcell.KeyUp, widget.prev)
widget.SetKeyboardKey(tcell.KeyDown, widget.Next)
widget.SetKeyboardKey(tcell.KeyEsc, widget.Unselect)
widget.SetKeyboardKey(tcell.KeyUp, widget.Prev)
}

70
modules/gitter/widget.go
View File

@@ -2,7 +2,6 @@ package gitter
import (
"fmt"
"strconv"
"github.com/rivo/tview"
"github.com/wtfutil/wtf/wtf"
@@ -24,34 +23,26 @@ const HelpText = `
type Widget struct {
wtf.HelpfulWidget
wtf.KeyboardWidget
wtf.TextWidget
app *tview.Application
wtf.ScrollableWidget
messages []Message
selected int
settings *Settings
}
// NewWidget creates a new instance of a widget
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
KeyboardWidget: wtf.NewKeyboardWidget(),
TextWidget: wtf.NewTextWidget(app, settings.common, true),
HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
KeyboardWidget: wtf.NewKeyboardWidget(),
ScrollableWidget: wtf.NewScrollableWidget(app, settings.common, true),
app: app,
settings: settings,
}
widget.SetRenderFunction(widget.Refresh)
widget.initializeKeyboardControls()
widget.View.SetInputCapture(widget.InputCapture)
widget.unselect()
widget.View.SetScrollable(true)
widget.View.SetRegions(true)
widget.HelpfulWidget.SetView(widget.View)
return &widget
@@ -66,25 +57,23 @@ func (widget *Widget) Refresh() {
room, err := GetRoom(widget.settings.roomURI, widget.settings.apiToken)
if err != nil {
widget.View.SetWrap(true)
widget.View.SetTitle(widget.CommonSettings.Title)
widget.View.SetText(err.Error())
widget.Redraw(widget.CommonSettings.Title, err.Error(), true)
return
}
if room == nil {
widget.Redraw(widget.CommonSettings.Title, "No room", true)
return
}
messages, err := GetMessages(room.ID, widget.settings.numberOfMessages, widget.settings.apiToken)
if err != nil {
widget.View.SetWrap(true)
widget.Redraw(widget.CommonSettings.Title, err.Error(), true)
return
}
widget.messages = messages
widget.SetItemCount(len(messages))
widget.display()
}
@@ -99,10 +88,6 @@ func (widget *Widget) display() {
title := fmt.Sprintf("%s - %s", widget.CommonSettings.Title, widget.settings.roomURI)
widget.Redraw(title, widget.contentFrom(widget.messages), true)
widget.app.QueueUpdateDraw(func() {
widget.View.Highlight(strconv.Itoa(widget.selected)).ScrollToHighlight()
widget.View.ScrollToEnd()
})
}
func (widget *Widget) contentFrom(messages []Message) string {
@@ -111,10 +96,10 @@ func (widget *Widget) contentFrom(messages []Message) string {
str = str + fmt.Sprintf(
`["%d"][%s] [blue]%s [lightslategray]%s: [%s]%s [aqua]%s[""]`,
idx,
widget.rowColor(idx),
widget.RowColor(idx),
message.From.DisplayName,
message.From.Username,
widget.rowColor(idx),
widget.RowColor(idx),
message.Text,
message.Sent.Format("Jan 02, 15:04 MST"),
)
@@ -125,41 +110,10 @@ func (widget *Widget) contentFrom(messages []Message) string {
return str
}
func (widget *Widget) rowColor(idx int) string {
if widget.View.HasFocus() && (idx == widget.selected) {
return widget.settings.common.DefaultFocussedRowColor()
}
return widget.settings.common.RowColor(idx)
}
func (widget *Widget) next() {
widget.selected++
if widget.messages != nil && widget.selected >= len(widget.messages) {
widget.selected = 0
}
widget.display()
}
func (widget *Widget) prev() {
widget.selected--
if widget.selected < 0 && widget.messages != nil {
widget.selected = len(widget.messages) - 1
}
widget.display()
}
func (widget *Widget) openMessage() {
sel := widget.selected
sel := widget.GetSelected()
if sel >= 0 && widget.messages != nil && sel < len(widget.messages) {
message := &widget.messages[widget.selected]
message := &widget.messages[sel]
wtf.OpenFile(message.Text)
}
}
func (widget *Widget) unselect() {
widget.selected = -1
widget.display()
}