Fix mask issue

box.go

@@ -88,7 +88,9 @@ func (b *Box) Draw(p *Painter) {
 	if b.border {
 		p.WithStyle(style, func(p *Painter) {
 			p.DrawRect(0, 0, sz.X, sz.Y)
-			p.WithMask(image.Rect(2, 0, sz.X-3, 0)).DrawText(2, 0, b.title)
+			p.WithMask(image.Rect(2, 0, sz.X-3, 0), func(p *Painter) {
+				p.DrawText(2, 0, b.title)
+			})
 		})
 
 		p.Translate(1, 1)
@@ -104,10 +106,12 @@ func (b *Box) Draw(p *Painter) {
 			p.Translate(0, off.Y)
 		}
 
-		child.Draw(p.WithMask(image.Rectangle{
+		p.WithMask(image.Rectangle{
 			Min: image.ZP,
 			Max: child.Size().Sub(image.Point{1, 1}),
-		}))
+		}, func(p *Painter) {
+			child.Draw(p)
+		})
 
 		p.Restore()
 

example/audioplayer/main.go

@@ -28,7 +28,7 @@ func main() {
 	library := tui.NewTable(0, 0)
 	library.SetColumnStretch(0, 1)
 	library.SetColumnStretch(1, 1)
-	library.SetColumnStretch(2, 2)
+	library.SetColumnStretch(2, 4)
 
 	library.AppendRow(
 		tui.NewLabel("ARTIST"),

grid.go

@@ -87,10 +87,12 @@ func (g *Grid) Draw(p *Painter) {
 
 			if w, ok := g.cells[pos]; ok {
 				p.Translate(wp.X, wp.Y)
-				w.Draw(p.WithMask(image.Rectangle{
+				p.WithMask(image.Rectangle{
 					Min: image.ZP,
 					Max: w.Size(),
-				}.Sub(image.Point{1, 1})))
+				}.Sub(image.Point{1, 1}), func(p *Painter) {
+					w.Draw(p)
+				})
 				p.Restore()
 			}
 		}

painter.go

@@ -158,9 +158,10 @@ func (p *Painter) WithStyle(n string, fn func(*Painter)) {
 	p.RestoreStyle()
 }
 
-func (p *Painter) WithMask(r image.Rectangle) *Painter {
+func (p *Painter) WithMask(r image.Rectangle, fn func(*Painter)) {
 	p.mask = r
-	return p
+	fn(p)
+	p.mask = image.ZR
 }
 
 func (p *Painter) mapLocalToWorld(point image.Point) image.Point {

table.go

@@ -75,21 +75,22 @@ func (t *Table) Draw(p *Painter) {
 			p.WithStyle(style, func(p *Painter) {
 				pos := image.Point{i, j}
 				wp := t.mapCellToLocal(pos)
-				width := t.colWidths[i]
 
 				p.Translate(wp.X, wp.Y)
 				defer p.Restore()
 
 				if w, ok := t.cells[pos]; ok {
 					size := w.Size()
-					size.X = width
+					size.X = t.colWidths[i]
 
 					p.FillRect(0, 0, size.X, size.Y)
 
-					w.Draw(p.WithMask(image.Rectangle{
+					p.WithMask(image.Rectangle{
 						Min: image.ZP,
-						Max: size.Sub(image.Point{1, 1}),
-					}))
+						Max: size,
+					}.Sub(image.Point{1, 1}), func(p *Painter) {
+						w.Draw(p)
+					})
 				}
 			})
 		}

table_test.go

@@ -33,7 +33,7 @@ var drawTableTests = []struct {
 ┌──────────────────────────────┐
 │┌───────────┬──────────┐┌────┐│
 ││ABC123     │test      ││test││
-││           │..........││....││
+││           │          ││....││
 │├───────────┼──────────┤│....││
 ││DEF456     │testing a ││....││
 │├───────────┼──────────┤│....││