Implement tab container

This commit is contained in:
Drew DeVault 2018-02-17 19:42:29 -05:00
parent 60b351b78c
commit 5b2e3a0ca0
3 changed files with 146 additions and 15 deletions

View file

@ -48,9 +48,13 @@ func main() {
panic(err) panic(err)
} }
tabs := ui.NewTabs()
tabs.Add(fill('★'), "白い星")
tabs.Add(fill('☆'), "empty stars")
grid := ui.NewGrid() grid := ui.NewGrid()
grid.Rows = []ui.DimSpec{ grid.Rows = []ui.DimSpec{
ui.DimSpec{ui.SIZE_EXACT, 4}, ui.DimSpec{ui.SIZE_EXACT, 1},
ui.DimSpec{ui.SIZE_WEIGHT, 1}, ui.DimSpec{ui.SIZE_WEIGHT, 1},
ui.DimSpec{ui.SIZE_WEIGHT, 1}, ui.DimSpec{ui.SIZE_WEIGHT, 1},
ui.DimSpec{ui.SIZE_EXACT, 1}, ui.DimSpec{ui.SIZE_EXACT, 1},
@ -59,8 +63,8 @@ func main() {
ui.DimSpec{ui.SIZE_WEIGHT, 3}, ui.DimSpec{ui.SIZE_WEIGHT, 3},
ui.DimSpec{ui.SIZE_WEIGHT, 2}, ui.DimSpec{ui.SIZE_WEIGHT, 2},
} }
grid.AddChild(fill('★')).At(0, 0).Span(1, 2) grid.AddChild(tabs.TabStrip).At(0, 0).Span(1, 2)
grid.AddChild(fill('☆')).At(1, 0).Span(1, 2) grid.AddChild(tabs.TabContent).At(1, 0).Span(1, 2)
grid.AddChild(fill('.')).At(2, 0).Span(1, 2) grid.AddChild(fill('.')).At(2, 0).Span(1, 2)
grid.AddChild(fill('•')).At(2, 1).Span(1, 1) grid.AddChild(fill('•')).At(2, 1).Span(1, 1)
grid.AddChild(fill('+')).At(3, 0).Span(1, 2) grid.AddChild(fill('+')).At(3, 0).Span(1, 2)
@ -71,6 +75,11 @@ func main() {
} }
defer _ui.Close() defer _ui.Close()
go (func() {
time.Sleep(1 * time.Second)
tabs.Select(1)
})()
for !_ui.Exit { for !_ui.Exit {
if !_ui.Tick() { if !_ui.Tick() {
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)

View file

@ -3,7 +3,8 @@ package ui
import ( import (
"fmt" "fmt"
"github.com/nsf/termbox-go" "github.com/mattn/go-runewidth"
tb "github.com/nsf/termbox-go"
) )
// A context allows you to draw in a sub-region of the terminal // A context allows you to draw in a sub-region of the terminal
@ -38,15 +39,15 @@ func (ctx *Context) Subcontext(x, y, width, height int) *Context {
} }
} }
func (ctx *Context) SetCell(x, y int, ch rune, fg, bg termbox.Attribute) { func (ctx *Context) SetCell(x, y int, ch rune, fg, bg tb.Attribute) {
if x >= ctx.width || y >= ctx.height { if x >= ctx.width || y >= ctx.height {
panic(fmt.Errorf("Attempted to draw outside of context")) panic(fmt.Errorf("Attempted to draw outside of context"))
} }
termbox.SetCell(ctx.x+x, ctx.y+y, ch, fg, bg) tb.SetCell(ctx.x+x, ctx.y+y, ch, fg, bg)
} }
func (ctx *Context) Printf(x, y int, ref termbox.Cell, func (ctx *Context) Printf(x, y int, ref tb.Cell,
format string, a ...interface{}) { format string, a ...interface{}) int {
if x >= ctx.width || y >= ctx.height { if x >= ctx.width || y >= ctx.height {
panic(fmt.Errorf("Attempted to draw outside of context")) panic(fmt.Errorf("Attempted to draw outside of context"))
@ -64,29 +65,35 @@ func (ctx *Context) Printf(x, y int, ref termbox.Cell,
return y < ctx.height return y < ctx.height
} }
for _, ch := range str { for _, ch := range str {
if str == " こんにちは " {
fmt.Printf("%c\n", ch)
}
switch ch { switch ch {
case '\n': case '\n':
if !newline() { if !newline() {
return return runewidth.StringWidth(str)
} }
case '\r': case '\r':
x = old_x x = old_x
default: default:
termbox.SetCell(x, y, ch, ref.Fg, ref.Bg) tb.SetCell(x, y, ch, ref.Fg, ref.Bg)
x++ x += runewidth.RuneWidth(ch)
if x == old_x+ctx.width { if x == old_x+ctx.width {
if !newline() { if !newline() {
return return runewidth.StringWidth(str)
}
} }
} }
} }
} }
func (ctx *Context) Fill(x, y, width, height int, ref termbox.Cell) { return runewidth.StringWidth(str)
}
func (ctx *Context) Fill(x, y, width, height int, ref tb.Cell) {
_x := x _x := x
for ; y < height && y < ctx.height; y++ { _y := y
for ; x < width && x < ctx.width; x++ { for ; y < _y+height && y < ctx.height; y++ {
for ; x < _x+width && x < ctx.width; x++ {
ctx.SetCell(x, y, ref.Ch, ref.Fg, ref.Bg) ctx.SetCell(x, y, ref.Ch, ref.Fg, ref.Bg)
} }
x = _x x = _x

115
ui/tab.go Normal file
View file

@ -0,0 +1,115 @@
package ui
import (
tb "github.com/nsf/termbox-go"
)
type Tabs struct {
Tabs []*Tab
TabStrip *TabStrip
TabContent *TabContent
Selected int
onInvalidateStrip func(d Drawable)
onInvalidateContent func(d Drawable)
}
type Tab struct {
Content Drawable
Name string
invalid bool
}
type TabStrip Tabs
type TabContent Tabs
func NewTabs() *Tabs {
tabs := &Tabs{}
tabs.TabStrip = (*TabStrip)(tabs)
tabs.TabContent = (*TabContent)(tabs)
return tabs
}
func (tabs *Tabs) Add(content Drawable, name string) {
tabs.Tabs = append(tabs.Tabs, &Tab{
Content: content,
Name: name,
})
tabs.TabStrip.Invalidate()
content.OnInvalidate(tabs.invalidateChild)
}
func (tabs *Tabs) invalidateChild(d Drawable) {
for i, tab := range tabs.Tabs {
if tab.Content == d {
if i == tabs.Selected {
tabs.TabContent.Invalidate()
}
return
}
}
}
func (tabs *Tabs) Remove(content Drawable) {
for i, tab := range tabs.Tabs {
if tab.Content == content {
tabs.Tabs = append(tabs.Tabs[:i], tabs.Tabs[i+1:]...)
break
}
}
tabs.TabStrip.Invalidate()
}
func (tabs *Tabs) Select(index int) {
if tabs.Selected != index {
tabs.Selected = index
tabs.TabStrip.Invalidate()
tabs.TabContent.Invalidate()
}
}
// TODO: Color repository
func (strip *TabStrip) Draw(ctx *Context) {
x := 0
for i, tab := range strip.Tabs {
cell := tb.Cell{
Fg: tb.ColorBlack,
Bg: tb.ColorWhite,
}
if strip.Selected == i {
cell.Fg = tb.ColorDefault
cell.Bg = tb.ColorDefault
}
x += ctx.Printf(x, 0, cell, " %s ", tab.Name)
}
cell := tb.Cell{
Fg: tb.ColorBlack,
Bg: tb.ColorWhite,
}
ctx.Fill(x, 0, ctx.Width()-x, 1, cell)
}
func (strip *TabStrip) Invalidate() {
if strip.onInvalidateStrip != nil {
strip.onInvalidateStrip(strip)
}
}
func (strip *TabStrip) OnInvalidate(onInvalidate func(d Drawable)) {
strip.onInvalidateStrip = onInvalidate
}
func (content *TabContent) Draw(ctx *Context) {
tab := content.Tabs[content.Selected]
tab.Content.Draw(ctx)
}
func (content *TabContent) Invalidate() {
if content.onInvalidateContent != nil {
content.onInvalidateContent(content)
}
}
func (content *TabContent) OnInvalidate(onInvalidate func(d Drawable)) {
content.onInvalidateContent = onInvalidate
}