diff options
| author | Sam Anthony <sam@samanthony.xyz> | 2024-05-09 17:32:54 -0400 |
|---|---|---|
| committer | Sam Anthony <sam@samanthony.xyz> | 2024-05-09 17:32:54 -0400 |
| commit | d463bb90ad629dfc8f1cd4f4b6b9590b0008832d (patch) | |
| tree | bf8763649c6a2f1af1fe46821216e327c094dcfa /gui | |
| parent | 76980fe3014b5c133c4e30590e92bd922aa9b9c1 (diff) | |
| download | volute-d463bb90ad629dfc8f1cd4f4b6b9590b0008832d.zip | |
tree widget
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/layout/split.go | 16 | ||||
| -rw-r--r-- | gui/text/concurrent_face.go (renamed from gui/widget/concurrent_face.go) | 2 | ||||
| -rw-r--r-- | gui/text/text.go (renamed from gui/widget/text.go) | 6 | ||||
| -rw-r--r-- | gui/widget/widget.go | 73 |
4 files changed, 86 insertions, 11 deletions
diff --git a/gui/layout/split.go b/gui/layout/split.go index db04225..455d74b 100644 --- a/gui/layout/split.go +++ b/gui/layout/split.go @@ -1,6 +1,10 @@ package layout -import "fmt" +import ( + "fmt" + + "volute/gui/text" +) // SplitFunc represents a way to split a space among a number of elements. // The length of the returned slice must be equal to the number of elements. @@ -24,3 +28,13 @@ func EvenSplit(elements int, width int) []int { } return ret } + +func TextRowSplit(elements int, space int) []int { + bounds := make([]int, elements) + height := text.Size("1").Y + for i := 0; i < elements && space > 0; i++ { + bounds[i] = min(height, space) + space -= bounds[i] + } + return bounds +} diff --git a/gui/widget/concurrent_face.go b/gui/text/concurrent_face.go index 98db572..c865251 100644 --- a/gui/widget/concurrent_face.go +++ b/gui/text/concurrent_face.go @@ -1,4 +1,4 @@ -package widget +package text import ( "image" diff --git a/gui/widget/text.go b/gui/text/text.go index 1b40096..dfe60e1 100644 --- a/gui/widget/text.go +++ b/gui/text/text.go @@ -1,4 +1,4 @@ -package widget +package text import ( "log" @@ -38,12 +38,12 @@ func init() { face = &concurrentFace{sync.Mutex{}, fce} } -func TextSize(text string) image.Point { +func Size(text string) image.Point { bounds := textBounds([]byte(text), font.Drawer{Face: face}) return image.Point{bounds.Max.X - bounds.Min.X + 2*PAD, bounds.Max.Y - bounds.Min.Y + 2*PAD} } -func drawText(text []byte, dst draw.Image, r image.Rectangle, fg, bg color.Color) { +func Draw(text []byte, dst draw.Image, r image.Rectangle, fg, bg color.Color) { drawer := font.Drawer{ Src: &image.Uniform{fg}, Face: face, diff --git a/gui/widget/widget.go b/gui/widget/widget.go index 2e7c671..3fd9637 100644 --- a/gui/widget/widget.go +++ b/gui/widget/widget.go @@ -11,6 +11,8 @@ import ( "image/draw" "volute/gui" + "volute/gui/layout" + "volute/gui/text" "volute/gui/win" ) @@ -23,12 +25,71 @@ var ( interpolator = xdraw.ApproxBiLinear ) -func Label(text string, r image.Rectangle, env gui.Env, wg *sync.WaitGroup) { +type Node[T any] struct { + Label string + Value T + Children []Node[T] + + expanded bool +} + +func Tree[T any](trees []Node[T], r image.Rectangle, focus FocusSlave, mux *gui.Mux, wg *sync.WaitGroup) { + defer wg.Done() + + var nodes []string + for _, root := range trees { + nodes = append(nodes, flatten(root, 0)...) + } + + bounds := layout.Grid{ + Rows: populate(make([]int, len(nodes)), 1), + Background: color.Gray{255}, + Gap: 1, + Split: layout.EvenSplit, + SplitRows: layout.TextRowSplit, + Margin: 0, + Border: 0, + BorderColor: color.Gray{16}, + Flip: false, + }.Lay(r) + for i := range nodes { + wg.Add(1) + go Label(nodes[i], bounds[i], mux.MakeEnv(), wg) + } + + /* + globalFocus := focus; + localFocus := NewFocusMaster([]int{1, 1, 1}); + defer localFocus.Close() + */ + // TODO +} + +func flatten[T any](root Node[T], depth int) []string { + indent := string(populate(make([]byte, 2*depth), ' ')) + nodes := []string{indent + root.Label} + root.expanded = true // TODO: remove me + if root.expanded { + for _, c := range root.Children { + nodes = append(nodes, flatten(c, depth+1)...) + } + } + return nodes +} + +func populate[T any](arr []T, v T) []T { + for i := range arr { + arr[i] = v + } + return arr +} + +func Label(str string, r image.Rectangle, env gui.Env, wg *sync.WaitGroup) { defer wg.Done() defer close(env.Draw()) redraw := func(drw draw.Image) image.Rectangle { - drawText([]byte(text), drw, r, BLACK, WHITE) + text.Draw([]byte(str), drw, r, BLACK, WHITE) return r } @@ -93,12 +154,12 @@ Loop: } } -func inputDraw(text []byte, focused bool, r image.Rectangle) func(draw.Image) image.Rectangle { +func inputDraw(str []byte, focused bool, r image.Rectangle) func(draw.Image) image.Rectangle { return func(drw draw.Image) image.Rectangle { if focused { - drawText(text, drw, r, GREEN, FOCUS_COLOR) + text.Draw(str, drw, r, GREEN, FOCUS_COLOR) } else { - drawText(text, drw, r, GREEN, WHITE) + text.Draw(str, drw, r, GREEN, WHITE) } return r } @@ -128,7 +189,7 @@ Loop: func outputDraw(v float64, r image.Rectangle) func(draw.Image) image.Rectangle { return func(drw draw.Image) image.Rectangle { - drawText([]byte(fmt.Sprintf("%.3f", v)), drw, r, BLACK, WHITE) + text.Draw([]byte(fmt.Sprintf("%.3f", v)), drw, r, BLACK, WHITE) return r } } |