mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-27 11:12:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add linebreak support to text.Draw (#1075)

Browse Source 
Closes #1074
This commit is contained in:
Zachary Burkett 2020-02-12 09:15:57 -05:00 committed by GitHub
parent 087f30b72d
commit bb60818e8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
text/text.go
View File

@ -261,6 +261,9 @@ func colorToColorM(clr color.Color) ebiten.ColorM {
// Be careful that this doesn't represent left-upper corner position. // Be careful that this doesn't represent left-upper corner position.
// clr is the color for text rendering. // clr is the color for text rendering.
// //
// The '\n' newline character puts the following text on the next line.
// Line height is based on Metrics().Height of the font.
//
// Glyphs used for rendering are cached in least-recently-used way. // Glyphs used for rendering are cached in least-recently-used way.
// It is OK to call Draw with a same text and a same face at every frame in terms of performance. // It is OK to call Draw with a same text and a same face at every frame in terms of performance.
// //
@ -271,7 +274,7 @@ func colorToColorM(clr color.Color) ebiten.ColorM {
func Draw(dst *ebiten.Image, text string, face font.Face, x, y int, clr color.Color) { func Draw(dst *ebiten.Image, text string, face font.Face, x, y int, clr color.Color) {
textM.Lock() textM.Lock()
fx := fixed.I(x) fx, fy := fixed.I(x), fixed.I(y)
prevR := rune(-1) prevR := rune(-1)
runes := []rune(text) runes := []rune(text)
@ -282,7 +285,14 @@ func Draw(dst *ebiten.Image, text string, face font.Face, x, y int, clr color.Co
if prevR >= 0 { if prevR >= 0 {
fx += face.Kern(prevR, r) fx += face.Kern(prevR, r)
} }
drawGlyph(dst, face, r, glyphImgs[i], fx, fixed.I(y), colorm) if r == '\n' {
fx = fixed.I(x)
fy += face.Metrics().Height
prevR = rune(-1)
continue
}
drawGlyph(dst, face, r, glyphImgs[i], fx, fy, colorm)
fx += glyphAdvance(face, r) fx += glyphAdvance(face, r)
prevR = r prevR = r