mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-10 04:57:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

text/v2: bug fix: given options were unexpectedly modified

Browse Source 
Closes #2954
This commit is contained in:
Hajime Hoshi 2024-04-07 22:14:53 +09:00
parent 4d268f5ce4
commit 106f3e1a57
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
text/v2/layout.go
View File

@ -105,16 +105,18 @@ func Draw(dst *ebiten.Image, text string, face Face, options *DrawOptions) {
options = &DrawOptions{} options = &DrawOptions{}
} }
geoM := options.GeoM // Copy the options to avoid modifying the original options (#2954).
drawOp := options.DrawImageOptions
geoM := drawOp.GeoM
for _, g := range AppendGlyphs(nil, text, face, &options.LayoutOptions) { for _, g := range AppendGlyphs(nil, text, face, &options.LayoutOptions) {
if g.Image == nil { if g.Image == nil {
continue continue
} }
op := &options.DrawImageOptions drawOp.GeoM.Reset()
op.GeoM.Reset() drawOp.GeoM.Translate(g.X, g.Y)
op.GeoM.Translate(g.X, g.Y) drawOp.GeoM.Concat(geoM)
op.GeoM.Concat(geoM) dst.DrawImage(g.Image, &drawOp)
dst.DrawImage(g.Image, op)
} }
} }

15
text/v2/text_test.go
View File

@ -356,3 +356,18 @@ func TestConvertToFloat(t *testing.T) {
} }
} }
} }
// Issue #2954
func TestDrawOptionsNotModified(t *testing.T) {
img := ebiten.NewImage(30, 30)
op := &text.DrawOptions{}
text.Draw(img, "Hello", text.NewGoXFace(bitmapfont.Face), op)
if got, want := op.GeoM, (ebiten.GeoM{}); got != want {
t.Errorf("got: %v, want: %v", got, want)
}
if got, want := op.ColorScale, (ebiten.ColorScale{}); got != want {
t.Errorf("got: %v, want: %v", got, want)
}
}