From bc64263dd83d29af0635cff4ad403d62e5d2eb9c Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Sun, 19 Jan 2020 21:30:53 +0200
Subject: [PATCH] freetype: fix placement of highdpi and lowdpi texts

---
 vlib/freetype/freetype.v | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/vlib/freetype/freetype.v b/vlib/freetype/freetype.v
index 21e9869749..c6f161751c 100644
--- a/vlib/freetype/freetype.v
+++ b/vlib/freetype/freetype.v
@@ -288,6 +288,7 @@ fn (ctx mut FreeType) private_draw_text(_x, _y int, utext ustring, cfg gx.TextCf
 	mut x := f32(_x)
 	mut y := f32(_y)
 	wx, wy := ctx.text_size(utext.s)
+	yoffset := if ctx.scale > 1 { 5 /* highdpi */ } else { -1 /* lowdpi */ }
 	// println('scale=$ctx.scale size=$cfg.size')
 	if cfg.align == gx.ALIGN_RIGHT {
 		//width := utext.len * 7
@@ -296,6 +297,7 @@ fn (ctx mut FreeType) private_draw_text(_x, _y int, utext ustring, cfg gx.TextCf
 	}
 	x *= ctx.scale
 	y *= ctx.scale
+	y += yoffset
 	y = f32(ctx.height) - y //invert y direction
 	color := cfg.color
 	// Activate corresponding render state
@@ -431,8 +433,10 @@ pub fn (ctx mut FreeType) text_size(s string) (int, int) {
 		}
 	}
 	//println('text width "$s" = ${time.ticks() - t} ms')
-	scaled_x := int(f64(x))
-	scaled_y := int(f64(maxy))
+	//scaled_x := x
+	//scaled_y := maxy
+	scaled_x := int(f64(x)/ctx.scale)
+	scaled_y := int(f64(maxy)/ctx.scale)	
 	//println('text_size of "${s}" | x,y: $x,$maxy | scaled_x: ${scaled_x:3d} | scaled_y: ${scaled_y:3d} ')
 	return scaled_x, scaled_y
 }