Merge remote-tracking branch 'keitio/master'

layout

8 files changed, 505 insertions, 0 deletions

diff --git a/examples/layout/blinker.go b/examples/layout/blinker.go
new file mode 100644
index 0000000..65dce43
--- /dev/null
+++ b/examples/layout/blinker.go
@@ -0,0 +1,71 @@
+package main
+
+import (
+	"image"
+	"image/color"
+	"image/draw"
+	"log"
+	"math/rand"
+	"sync"
+	"time"
+
+	"github.com/faiface/gui"
+	"github.com/faiface/gui/win"
+)
+
+func Blinker(env gui.Env) {
+	defer func() {
+		if recover() != nil {
+			log.Print("recovered blinker")
+		}
+	}()
+	buf := make([]byte, 3)
+	rand.Read(buf)
+	defaultColor := image.NewUniform(color.RGBA{buf[0], buf[1], buf[2], 255})
+	rand.Read(buf)
+	blinkColor := image.NewUniform(color.RGBA{buf[0], buf[1], buf[2], 255})
+	redraw := func(r image.Rectangle, visible bool) func(draw.Image) image.Rectangle {
+		return func(drw draw.Image) image.Rectangle {
+			if r == image.ZR {
+				return r
+			}
+			if visible {
+				draw.Draw(drw, r, defaultColor, image.ZP, draw.Src)
+			} else {
+				draw.Draw(drw, r, blinkColor, image.ZP, draw.Src)
+			}
+			return r
+		}
+	}
+
+	var mu sync.Mutex
+	var (
+		r       image.Rectangle
+		visible bool = true
+	)
+
+	// first we draw a white rectangle
+	// env.Draw() <- redraw(b)
+	func() {
+		for event := range env.Events() {
+			switch event := event.(type) {
+			case win.MoDown:
+				if event.Point.In(r) {
+					go func() {
+						for i := 0; i < 6; i++ {
+							mu.Lock()
+							visible = !visible
+							env.Draw() <- redraw(r, visible)
+							mu.Unlock()
+
+							time.Sleep(time.Second / 3)
+						}
+					}()
+				}
+			case gui.Resize:
+				r = event.Rectangle
+				env.Draw() <- redraw(r, visible)
+			}
+		}
+	}()
+}
diff --git a/examples/layout/button.go b/examples/layout/button.go
new file mode 100644
index 0000000..cf13c3d
--- /dev/null
+++ b/examples/layout/button.go
@@ -0,0 +1,69 @@
+package main
+
+import (
+	"image"
+	"image/color"
+	"image/draw"
+
+	"github.com/faiface/gui"
+	"github.com/faiface/gui/win"
+)
+
+func Button(env gui.Env, theme *Theme, text string, action func()) {
+	textImg := MakeTextImage(text, theme.Face, theme.Text)
+
+	redraw := func(r image.Rectangle, over, pressed bool) func(draw.Image) image.Rectangle {
+		return func(drw draw.Image) image.Rectangle {
+			var clr color.Color
+			if pressed {
+				clr = theme.ButtonDown
+			} else if over {
+				clr = theme.ButtonOver
+			} else {
+				clr = theme.ButtonUp
+			}
+			draw.Draw(drw, r, &image.Uniform{clr}, image.ZP, draw.Src)
+			DrawCentered(drw, r, textImg, draw.Over)
+			return r
+		}
+	}
+
+	var (
+		r       image.Rectangle
+		over    bool
+		pressed bool
+	)
+
+	for e := range env.Events() {
+		switch e := e.(type) {
+		case gui.Resize:
+			r = e.Rectangle
+			env.Draw() <- redraw(r, over, pressed)
+
+		case win.MoMove:
+			nover := e.Point.In(r)
+			if nover != over {
+				over = nover
+				env.Draw() <- redraw(r, over, pressed)
+			}
+
+		case win.MoDown:
+			newPressed := e.Point.In(r)
+			if newPressed != pressed {
+				pressed = newPressed
+				env.Draw() <- redraw(r, over, pressed)
+			}
+
+		case win.MoUp:
+			if pressed {
+				if e.Point.In(r) {
+					action()
+				}
+				pressed = false
+				env.Draw() <- redraw(r, over, pressed)
+			}
+		}
+	}
+
+	close(env.Draw())
+}
diff --git a/examples/layout/card.go b/examples/layout/card.go
new file mode 100644
index 0000000..501e4e3
--- /dev/null
+++ b/examples/layout/card.go
@@ -0,0 +1,24 @@
+package main
+
+import (
+	"github.com/faiface/gui"
+	"github.com/faiface/gui/layout"
+	"golang.org/x/image/colornames"
+)
+
+func Card(env gui.Env, theme *Theme, title, content string) {
+	box := layout.Grid{
+		Rows: []int{1, 1},
+		// Flip:       true,
+		// Gap:        4,
+		Background: colornames.Pink,
+	}
+	fields := makeEnvPtr(2)
+	layout.NewMux(env,
+		fields,
+		box,
+	)
+	go Label(*fields[0], theme, title, colornames.Lightgray)
+	go Label(*fields[1], theme, content, colornames.Slategray)
+	// go Blinker(*fields[1])
+}
diff --git a/examples/layout/label.go b/examples/layout/label.go
new file mode 100644
index 0000000..f46f25f
--- /dev/null
+++ b/examples/layout/label.go
@@ -0,0 +1,35 @@
+package main
+
+import (
+	"image"
+	"image/color"
+	"image/draw"
+
+	"github.com/faiface/gui"
+)
+
+func Label(env gui.Env, theme *Theme, text string, colr color.Color) {
+	textImg := MakeTextImage(text, theme.Face, theme.Text)
+
+	redraw := func(r image.Rectangle) func(draw.Image) image.Rectangle {
+		return func(drw draw.Image) image.Rectangle {
+			draw.Draw(drw, r, &image.Uniform{colr}, image.ZP, draw.Src)
+			DrawLeftCentered(drw, r.Add(image.Pt(5, 0)), textImg, draw.Over)
+			return r
+		}
+	}
+
+	var (
+		r image.Rectangle
+	)
+
+	for e := range env.Events() {
+		switch e := e.(type) {
+		case gui.Resize:
+			r = e.Rectangle
+			env.Draw() <- redraw(r)
+		}
+	}
+
+	close(env.Draw())
+}
diff --git a/examples/layout/layout b/examples/layout/layout
new file mode 100755
index 0000000..e7e9c5b
--- /dev/null
+++ b/examples/layout/layout
diff --git a/examples/layout/main.go b/examples/layout/main.go
new file mode 100644
index 0000000..83a170d
--- /dev/null
+++ b/examples/layout/main.go
@@ -0,0 +1,183 @@
+package main
+
+import (
+	"fmt"
+	"image"
+	"image/draw"
+	"log"
+	"os"
+	"time"
+
+	"github.com/faiface/gui"
+	"github.com/faiface/gui/layout"
+	"github.com/faiface/gui/win"
+	"github.com/faiface/mainthread"
+	"golang.org/x/image/colornames"
+	"golang.org/x/image/font/gofont/goregular"
+)
+
+func makeEnvPtr(n int) []*gui.Env {
+	elsp := make([]*gui.Env, n)
+	for i := 0; i < len(elsp); i++ {
+		elsp[i] = new(gui.Env)
+	}
+	return elsp
+}
+
+func run() {
+	face, err := TTFToFace(goregular.TTF, 18)
+	if err != nil {
+		panic(err)
+	}
+	theme := &Theme{
+		Face:       face,
+		Background: colornames.White,
+		Empty:      colornames.Darkgrey,
+		Text:       colornames.Black,
+		Highlight:  colornames.Blueviolet,
+		ButtonUp:   colornames.Lightgrey,
+		ButtonOver: colornames.Grey,
+		ButtonDown: colornames.Dimgrey,
+	}
+	w, err := win.New(win.Title("gui test")) // win.Resizable(),
+	if err != nil {
+		panic(err)
+	}
+
+	mux, env := gui.NewMux(w)
+
+	go func() {
+		// Hack for non-reparenting window managers (I think)
+		e := mux.MakeEnv()
+		for {
+			time.Sleep(time.Second / 10)
+			e.Draw() <- func(drw draw.Image) image.Rectangle {
+				r := image.Rect(0, 0, 10, 10)
+				draw.Draw(drw, r, image.Transparent, image.ZP, draw.Over)
+				return r
+			}
+		}
+	}()
+
+	var (
+		top                             gui.Env
+		left, right                     gui.Env
+		bottomLeft, bottom, bottomRight gui.Env
+	)
+	layout.NewMux(
+		mux.MakeEnv(),
+		[]*gui.Env{
+			&top,
+			&left, &right,
+			&bottomLeft, &bottom, &bottomRight},
+		layout.Grid{
+			Rows:   []int{1, 2, 3},
+			Gap:    10,
+			Margin: -6,
+			Border: 1,
+			// Flip:        true,
+			BorderColor: image.White,
+			Background:  colornames.Sandybrown,
+			SplitRows: func(els int, width int) []int {
+				ret := make([]int, els)
+				total := 0
+				for i := 0; i < els-1; i++ {
+					ret[i] = (width - total) / 2
+					total += ret[i]
+				}
+				ret[els-1] = width - total
+				return ret
+			},
+		},
+	)
+	go Blinker(right)
+	go Blinker(left)
+	go Blinker(bottomRight)
+
+	subGrid := makeEnvPtr(3)
+	layout.NewMux(top,
+		subGrid,
+		layout.Grid{
+			Rows:       []int{len(subGrid)},
+			Gap:        10,
+			Background: colornames.Lightblue,
+		},
+	)
+
+	elsp := makeEnvPtr(100)
+	scrl := &layout.Scroller{
+		Background:  colornames.Red,
+		Length:      len(elsp),
+		Gap:         2,
+		ChildHeight: 80,
+	}
+	layout.NewMux(*subGrid[0],
+		elsp,
+		scrl,
+	)
+	for i, el := range elsp {
+		// go Blinker(*el)
+		go Card(*el, theme, "hello", fmt.Sprintf("I'm card #%d", i))
+	}
+
+	go Blinker(*subGrid[1])
+	box := layout.Grid{
+		Rows:       []int{3},
+		Flip:       true,
+		Gap:        4,
+		Background: colornames.Pink,
+		Split: func(els int, width int) []int {
+			ret := make([]int, els)
+			total := 0
+			for i := 0; i < els-1; i++ {
+				v := (width - total) / 2
+				ret[i] = v
+				total += v
+			}
+			ret[els-1] = width - total
+			return ret
+		},
+	}
+	blinkers := makeEnvPtr(3)
+	layout.NewMux(*subGrid[2],
+		blinkers,
+		box,
+	)
+
+	go Blinker(*blinkers[0])
+	go Blinker(*blinkers[1])
+	go Blinker(*blinkers[2])
+
+	btns := makeEnvPtr(3)
+	layout.NewMux(
+		bottom,
+		btns,
+		layout.Grid{
+			Rows:       []int{2, 1},
+			Background: colornames.Darkgrey,
+			Gap:        4,
+			Flip:       true,
+		},
+	)
+	btn := func(env gui.Env, name string) {
+		Button(env, theme, name, func() {
+			log.Print(name)
+		})
+	}
+	go btn(*btns[0], "Hey")
+	go btn(*btns[1], "Ho")
+	go btn(*btns[2], "Hu")
+
+	// we use the master env now, w is used by the mux
+	for event := range env.Events() {
+		switch event.(type) {
+		case win.WiClose:
+			close(env.Draw())
+			os.Exit(0)
+		}
+	}
+}
+
+func main() {
+	mainthread.Run(run)
+}
diff --git a/examples/layout/theme.go b/examples/layout/theme.go
new file mode 100644
index 0000000..e37c0c0
--- /dev/null
+++ b/examples/layout/theme.go
@@ -0,0 +1,19 @@
+package main
+
+import (
+	"image/color"
+
+	"golang.org/x/image/font"
+)
+
+type Theme struct {
+	Face font.Face
+
+	Background color.Color
+	Empty      color.Color
+	Text       color.Color
+	Highlight  color.Color
+	ButtonUp   color.Color
+	ButtonOver color.Color
+	ButtonDown color.Color
+}
diff --git a/examples/layout/utils.go b/examples/layout/utils.go
new file mode 100644
index 0000000..e799988
--- /dev/null
+++ b/examples/layout/utils.go
@@ -0,0 +1,104 @@
+package main
+
+import (
+	"image"
+	"image/color"
+	"image/draw"
+	"sync"
+
+	"github.com/golang/freetype/truetype"
+
+	"golang.org/x/image/font"
+	"golang.org/x/image/math/fixed"
+)
+
+type concurrentFace struct {
+	mu   sync.Mutex
+	face font.Face
+}
+
+func (cf *concurrentFace) Close() error {
+	cf.mu.Lock()
+	defer cf.mu.Unlock()
+	return cf.face.Close()
+}
+
+func (cf *concurrentFace) Glyph(dot fixed.Point26_6, r rune) (dr image.Rectangle, mask image.Image, maskp image.Point, advance fixed.Int26_6, ok bool) {
+	cf.mu.Lock()
+	defer cf.mu.Unlock()
+	return cf.face.Glyph(dot, r)
+}
+
+func (cf *concurrentFace) GlyphBounds(r rune) (bounds fixed.Rectangle26_6, advance fixed.Int26_6, ok bool) {
+	cf.mu.Lock()
+	defer cf.mu.Unlock()
+	return cf.face.GlyphBounds(r)
+}
+
+func (cf *concurrentFace) GlyphAdvance(r rune) (advance fixed.Int26_6, ok bool) {
+	cf.mu.Lock()
+	defer cf.mu.Unlock()
+	return cf.face.GlyphAdvance(r)
+}
+
+func (cf *concurrentFace) Kern(r0, r1 rune) fixed.Int26_6 {
+	cf.mu.Lock()
+	defer cf.mu.Unlock()
+	return cf.face.Kern(r0, r1)
+}
+
+func (cf *concurrentFace) Metrics() font.Metrics {
+	cf.mu.Lock()
+	defer cf.mu.Unlock()
+	return cf.face.Metrics()
+}
+
+func TTFToFace(ttf []byte, size float64) (font.Face, error) {
+	font, err := truetype.Parse(ttf)
+	if err != nil {
+		return nil, err
+	}
+	return &concurrentFace{face: truetype.NewFace(font, &truetype.Options{
+		Size: size,
+	})}, nil
+}
+
+func MakeTextImage(text string, face font.Face, clr color.Color) image.Image {
+	drawer := &font.Drawer{
+		Src:  &image.Uniform{clr},
+		Face: face,
+		Dot:  fixed.P(0, 0),
+	}
+	b26_6, _ := drawer.BoundString(text)
+	bounds := image.Rect(
+		b26_6.Min.X.Floor(),
+		b26_6.Min.Y.Floor(),
+		b26_6.Max.X.Ceil(),
+		b26_6.Max.Y.Ceil(),
+	)
+	drawer.Dst = image.NewRGBA(bounds)
+	drawer.DrawString(text)
+	return drawer.Dst
+}
+
+func DrawCentered(dst draw.Image, r image.Rectangle, src image.Image, op draw.Op) {
+	if src == nil {
+		return
+	}
+	bounds := src.Bounds()
+	center := bounds.Min.Add(bounds.Max).Div(2)
+	target := r.Min.Add(r.Max).Div(2)
+	delta := target.Sub(center)
+	draw.Draw(dst, bounds.Add(delta).Intersect(r), src, bounds.Min, op)
+}
+
+func DrawLeftCentered(dst draw.Image, r image.Rectangle, src image.Image, op draw.Op) {
+	if src == nil {
+		return
+	}
+	bounds := src.Bounds()
+	leftCenter := image.Pt(bounds.Min.X, (bounds.Min.Y+bounds.Max.Y)/2)
+	target := image.Pt(r.Min.X, (r.Min.Y+r.Max.Y)/2)
+	delta := target.Sub(leftCenter)
+	draw.Draw(dst, bounds.Add(delta).Intersect(r), src, bounds.Min, op)
+}