Merge pull request #1672 from BioniCosmos/main

rcoreilly · web-flow · commit a8e193eb3f9f · 2026-04-25T14:00:12.000+02:00
Fix canvas render on web target
diff --git a/paint/renderers/htmlcanvas/htmlcanvas.go b/paint/renderers/htmlcanvas/htmlcanvas.go
@@ -104,7 +104,7 @@ func (rs *Renderer) PopContext(pt *render.ContextPop) {
 }
 
 func (rs *Renderer) setTransform(ctx *render.Context) {
-	m := ctx.Transform
+	m := ctx.Cumulative
 	rs.ctx.Call("setTransform", m.XX, m.YX, m.XY, m.YY, m.X0, m.Y0)
 }
 
diff --git a/paint/renderers/htmlcanvas/path.go b/paint/renderers/htmlcanvas/path.go
@@ -57,7 +57,7 @@ func (rs *Renderer) RenderPath(pt *render.Path) {
 		rs.ctx.Call("fill", style.Fill.Rule.String())
 	}
 	if style.HasStroke() {
-		scale := math32.Sqrt(math32.Abs(pt.Context.Transform.Det()))
+		scale := math32.Sqrt(math32.Abs(pt.Context.Cumulative.Det()))
 		if scale != 1 {
 			// note: this is a hack to get the effect of [ppath.VectorEffectNonScalingStroke]
 			stk := style.Stroke

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ func (rs Renderer) PopContext(pt render.ContextPop) {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`func (rs Renderer) setTransform(ctx render.Context) {`
`107`		`- m := ctx.Transform`
	`107`	`+ m := ctx.Cumulative`
`108`	`108`	`rs.ctx.Call("setTransform", m.XX, m.YX, m.XY, m.YY, m.X0, m.Y0)`
`109`	`109`	`}`
`110`	`110`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func (rs Renderer) RenderPath(pt render.Path) {`
`57`	`57`	`rs.ctx.Call("fill", style.Fill.Rule.String())`
`58`	`58`	`}`
`59`	`59`	`if style.HasStroke() {`
`60`		`- scale := math32.Sqrt(math32.Abs(pt.Context.Transform.Det()))`
	`60`	`+ scale := math32.Sqrt(math32.Abs(pt.Context.Cumulative.Det()))`
`61`	`61`	`if scale != 1 {`
`62`	`62`	`// note: this is a hack to get the effect of [ppath.VectorEffectNonScalingStroke]`
`63`	`63`	`stk := style.Stroke`