From a749f6fbc351f7b0e75e51078067af15b2e40ddf Mon Sep 17 00:00:00 2001
From: Hajime Hoshi <hajimehoshi@gmail.com>
Date: Thu, 16 Nov 2023 22:18:49 +0900
Subject: [PATCH] examples/blend: use text/v2

Updates #2454
---
 examples/blend/main.go | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/examples/blend/main.go b/examples/blend/main.go
index e9ea741ab..40b80e326 100644
--- a/examples/blend/main.go
+++ b/examples/blend/main.go
@@ -22,13 +22,11 @@ import (
 	_ "image/png"
 	"log"
 
-	"golang.org/x/image/font"
 	"golang.org/x/image/font/inconsolata"
-	"golang.org/x/image/math/fixed"
 
 	"github.com/hajimehoshi/ebiten/v2"
 	"github.com/hajimehoshi/ebiten/v2/examples/resources/images/blend"
-	"github.com/hajimehoshi/ebiten/v2/text"
+	"github.com/hajimehoshi/ebiten/v2/text/v2"
 )
 
 const (
@@ -36,6 +34,10 @@ const (
 	screenHeight = 800
 )
 
+var (
+	inconsolataFace = text.NewStdFace(inconsolata.Bold8x16)
+)
+
 // mode is a blend mode with description.
 type mode struct {
 	blend ebiten.Blend
@@ -176,17 +178,14 @@ func maxSide(a, b *ebiten.Image) int {
 	)
 }
 
-func fixed26_6ToFloat64(x fixed.Int26_6) float64 {
-	return float64(x>>6) + float64(x&((1<<6)-1))/float64(1<<6)
-}
-
 // drawCenteredText is a util function for drawing blend mode description.
 func drawCenteredText(screen *ebiten.Image, cx, cy float64, s string) {
-	advance := font.MeasureString(inconsolata.Bold8x16, s)
-	m := inconsolata.Bold8x16.Metrics()
-	height := m.Ascent + m.Descent
-	x, y := int(cx-fixed26_6ToFloat64(advance)/2), int(cy-fixed26_6ToFloat64(height)/2+fixed26_6ToFloat64(m.Ascent))
-	text.Draw(screen, s, inconsolata.Bold8x16, x, y, color.Black)
+	op := &text.DrawOptions{}
+	op.GeoM.Translate(cx, cy)
+	op.ColorScale.ScaleWithColor(color.Black)
+	op.PrimaryAlign = text.AlignCenter
+	op.SecondaryAlign = text.AlignCenter
+	text.Draw(screen, s, inconsolataFace, op)
 }
 
 func main() {