mstar/canvas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed stroke text rendering

Browse source
This commit is contained in:
Thomas Friedel 2020-03-24 10:24:44 +01:00
parent 30531aaab7
commit c36395c0c8
2 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
testdata/Text.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

23
text.go
View file

@ -282,25 +282,8 @@ func (cv *Canvas) StrokeText(str string, x, y float64) {
return
}
// calculate offsets
if cv.state.textAlign == Center {
x -= float64(strWidth) * 0.5
} else if cv.state.textAlign == Right || cv.state.textAlign == End {
x -= float64(strWidth)
}
metrics := cv.state.fontMetrics
switch cv.state.textBaseline {
case Alphabetic:
case Middle:
y += (-float64(metrics.Descent)/64 + float64(metrics.Height)*0.5/64)
case Top, Hanging:
y += (-float64(metrics.Descent)/64 + float64(metrics.Height)/64)
case Bottom, Ideographic:
y += -float64(metrics.Descent) / 64
}
scale := float64(cv.state.fontSize) / float64(baseFontSize)
basetf := backendbase.MatScale(backendbase.Vec{scale, scale}).Mul(cv.state.transform)
scaleMat := backendbase.MatScale(backendbase.Vec{scale, scale})
prev, hasPrev := truetype.Index(0), false
for _, rn := range str {
@ -322,8 +305,8 @@ func (cv *Canvas) StrokeText(str string, x, y float64) {
}
path := cv.runePath(rn)
tf := backendbase.MatTranslate(backendbase.Vec{x, y}).Mul(basetf)
cv.strokePath(path, tf, false)
tf := scaleMat.Mul(backendbase.MatTranslate(backendbase.Vec{x, y})).Mul(cv.state.transform)
cv.strokePath(path, tf, true)
x += float64(advance) / 64
}