new paint infrastructure with improved path, text, and image elements

cmd/core/rendericon/rendericon.go

@@ -13,15 +13,12 @@ import (
 	"strings"
 
 	"cogentcore.org/core/icons"
-	"cogentcore.org/core/paint"
 	"cogentcore.org/core/svg"
 )
 
 // Render renders the icon located at icon.svg at the given size.
 // If no such icon exists, it sets it to a placeholder icon, [icons.DefaultAppIcon].
 func Render(size int) (*image.RGBA, error) {
-	paint.FontLibrary.InitFontPaths(paint.FontPaths...)
-
 	sv := svg.NewSVG(size, size)
 
 	spath := "icon.svg"
@@ -41,5 +38,5 @@ func Render(size int) (*image.RGBA, error) {
 	}
 
 	sv.Render()
-	return sv.Pixels, nil
+	return sv.RenderImage(), nil
 }

cmd/core/web/embed/app.css

@@ -29,9 +29,11 @@ body {
   }
 }
 
-body > #app {
-  width: 100vw;
-  height: 100vh;
+body > canvas {
+  position: fixed;
+  top: 0;
+  /* width: 100vw;
+  height: 100vh; */
 
   /* no selection of canvas */
   -webkit-touch-callout: none;

core/app.go

@@ -66,15 +66,15 @@ func appIconImages() []image.Image {
 	}
 
 	sv.Render()
-	res[0] = sv.Pixels
+	res[0] = sv.RenderImage()
 
 	sv.Resize(image.Pt(32, 32))
 	sv.Render()
-	res[1] = sv.Pixels
+	res[1] = sv.RenderImage()
 
 	sv.Resize(image.Pt(48, 48))
 	sv.Render()
-	res[2] = sv.Pixels
+	res[2] = sv.RenderImage()
 	appIconImagesCache = res
 	return res
 }

core/button.go

@@ -129,7 +129,7 @@ func (bt *Button) Init() {
 				s.Padding.Right.Dp(16)
 			}
 		}
-		s.Font.Size.Dp(14) // Button font size is used for text font size
+		s.Text.FontSize.Dp(14) // Button font size is used for text font size
 		s.Gap.Zero()
 		s.CenterAll()
 
@@ -210,7 +210,7 @@ func (bt *Button) Init() {
 		if bt.Icon.IsSet() {
 			tree.AddAt(p, "icon", func(w *Icon) {
 				w.Styler(func(s *styles.Style) {
-					s.Font.Size.Dp(18)
+					s.Text.FontSize.Dp(18)
 				})
 				w.Updater(func() {
 					w.SetIcon(bt.Icon)
@@ -226,7 +226,7 @@ func (bt *Button) Init() {
 					s.SetNonSelectable()
 					s.SetTextWrap(false)
 					s.FillMargin = false
-					s.Font.Size = bt.Styles.Font.Size // Directly inherit to override the [Text.Type]-based default
+					s.Text.FontSize = bt.Styles.Text.FontSize // Directly inherit to override the [Text.Type]-based default
 				})
 				w.Updater(func() {
 					if bt.Type == ButtonMenu {

core/button_test.go

@@ -109,7 +109,7 @@ func TestButtonFontSize(t *testing.T) {
 	b := NewBody()
 	bt := NewButton(b).SetText("Hello")
 	bt.Styler(func(s *styles.Style) {
-		s.Font.Size.Dp(48)
+		s.Text.FontSize.Dp(48)
 	})
 	b.AssertRender(t, "button/font-size")
 }

core/canvas.go

@@ -7,6 +7,7 @@ package core
 import (
 	"cogentcore.org/core/math32"
 	"cogentcore.org/core/paint"
+	"cogentcore.org/core/paint/ppath"
 	"cogentcore.org/core/styles"
 	"cogentcore.org/core/styles/units"
 	"golang.org/x/image/draw"
@@ -21,10 +22,10 @@ type Canvas struct {
 	// canvas every time that it is rendered. The paint context
 	// is automatically normalized to the size of the canvas,
 	// so you should specify points on a 0-1 scale.
-	Draw func(pc *paint.Context)
+	Draw func(pc *paint.Painter)
 
-	// context is the paint context used for drawing.
-	context *paint.Context
+	// painter is the paint painter used for drawing.
+	painter *paint.Painter
 }
 
 func (c *Canvas) Init() {
@@ -39,12 +40,14 @@ func (c *Canvas) Render() {
 
 	sz := c.Geom.Size.Actual.Content
 	szp := c.Geom.Size.Actual.Content.ToPoint()
-	c.context = paint.NewContext(szp.X, szp.Y)
-	c.context.UnitContext = c.Styles.UnitContext
-	c.context.ToDots()
-	c.context.PushTransform(math32.Scale2D(sz.X, sz.Y))
-	c.context.VectorEffect = styles.VectorEffectNonScalingStroke
-	c.Draw(c.context)
-
-	draw.Draw(c.Scene.Pixels, c.Geom.ContentBBox, c.context.Image, c.Geom.ScrollOffset(), draw.Over)
+	c.painter = paint.NewPainter(szp.X, szp.Y)
+	c.painter.Paint.Transform = math32.Scale2D(sz.X, sz.Y)
+	c.painter.Context().Transform = math32.Scale2D(sz.X, sz.Y)
+	c.painter.UnitContext = c.Styles.UnitContext
+	c.painter.ToDots()
+	c.painter.VectorEffect = ppath.VectorEffectNonScalingStroke
+	c.Draw(c.painter)
+
+	// todo: direct render for painter to painter
+	c.Scene.Painter.DrawImage(c.painter.RenderImage(), c.Geom.ContentBBox, c.Geom.ScrollOffset(), draw.Over)
 }