Merge pull request #16 from goccy/feature/fix-text-layout

Fix text layout
goccy · Feb 22, 2020 · fe87c3f · fe87c3f
2 parents c8837f2 + 5c4e21d
commit fe87c3f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/graphviz_test.go b/graphviz_test.go
@@ -37,7 +37,7 @@ func TestGraphviz_Image(t *testing.T) {
 			if err := g.Render(graph, graphviz.PNG, &buf); err != nil {
 				t.Fatalf("%+v", err)
 			}
-			if len(buf.Bytes()) != 4638 {
+			if len(buf.Bytes()) != 4625 {
 				t.Fatalf("failed to encode png: bytes length is %d", len(buf.Bytes()))
 			}
 		})
@@ -61,7 +61,7 @@ func TestGraphviz_Image(t *testing.T) {
 			if err := g.Render(graph, graphviz.JPG, &buf); err != nil {
 				t.Fatalf("%+v", err)
 			}
-			if len(buf.Bytes()) != 3281 {
+			if len(buf.Bytes()) != 3283 {
 				t.Fatalf("failed to encode jpg: bytes length is %d", len(buf.Bytes()))
 			}
 		})

diff --git a/gvc/image_renderer.go b/gvc/image_renderer.go
@@ -110,9 +110,17 @@ func (r *ImageRenderer) TextSpan(job *Job, p Pointf, span *TextSpan) error {
 	if err != nil {
 		return err
 	}
+	switch span.Just() {
+	case 'r':
+		p.X -= span.Size().X
+	case 'l':
+		p.X -= 0.0
+	case 'n':
+		p.X -= (span.Size().X / 2.0)
+	}
 	r.ctx.SetFontFace(face)
 	y := p.Y + span.YOffsetCenterLine() + span.YOffsetLayout()
-	r.ctx.DrawStringAnchored(span.Str(), p.X, -y, 0.5, 0)
+	r.ctx.DrawStringAnchored(span.Str(), p.X, -y, 0, 0)
 	return nil
 }