From 2c486cb7f52ac5dd88f7445ca79726639e4a0084 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Tue, 14 May 2019 16:18:21 -0400 Subject: Update tab name as subject changes Also moves truncation to the tab widget --- lib/ui/tab.go | 4 +++- lib/ui/textinput.go | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'lib/ui') diff --git a/lib/ui/tab.go b/lib/ui/tab.go index 49bdffa..c39e327 100644 --- a/lib/ui/tab.go +++ b/lib/ui/tab.go @@ -2,6 +2,7 @@ package ui import ( "github.com/gdamore/tcell" + "github.com/mattn/go-runewidth" ) type Tabs struct { @@ -87,7 +88,8 @@ func (strip *TabStrip) Draw(ctx *Context) { if strip.Selected == i { style = tcell.StyleDefault } - x += ctx.Printf(x, 0, style, " %s ", tab.Name) + trunc := runewidth.Truncate(tab.Name, 32, "…") + x += ctx.Printf(x, 0, style, " %s ", trunc) } style := tcell.StyleDefault.Reverse(true) ctx.Fill(x, 0, ctx.Width()-x, 1, ' ', style) diff --git a/lib/ui/textinput.go b/lib/ui/textinput.go index 688d91d..9d2cdc7 100644 --- a/lib/ui/textinput.go +++ b/lib/ui/textinput.go @@ -17,6 +17,7 @@ type TextInput struct { prompt string scroll int text []rune + change []func(ti *TextInput) } // Creates a new TextInput. TextInputs will render a "textbox" in the entire @@ -69,6 +70,7 @@ func (ti *TextInput) insert(ch rune) { ti.text = append(left, append([]rune{ch}, right...)...) ti.index++ ti.Invalidate() + ti.onChange() } func (ti *TextInput) deleteWord() { @@ -88,12 +90,14 @@ func (ti *TextInput) deleteWord() { ti.text = append(ti.text[:i+1], ti.text[ti.index:]...) ti.index = i + 1 ti.Invalidate() + ti.onChange() } func (ti *TextInput) deleteChar() { if len(ti.text) > 0 && ti.index != len(ti.text) { ti.text = append(ti.text[:ti.index], ti.text[ti.index+1:]...) ti.Invalidate() + ti.onChange() } } @@ -102,9 +106,20 @@ func (ti *TextInput) backspace() { ti.text = append(ti.text[:ti.index-1], ti.text[ti.index:]...) ti.index-- ti.Invalidate() + ti.onChange() } } +func (ti *TextInput) onChange() { + for _, change := range ti.change { + change(ti) + } +} + +func (ti *TextInput) OnChange(onChange func(ti *TextInput)) { + ti.change = append(ti.change, onChange) +} + func (ti *TextInput) Event(event tcell.Event) bool { switch event := event.(type) { case *tcell.EventKey: -- cgit 1.4.1-2-gfad0