From 126141a52ccece200d3a5629f4505935e3175184 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Wed, 8 Aug 2012 14:04:57 +0100 Subject: Ensure text is at the right height for Freetype and Internal fonts. --- framebuffer/fbtk/text.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'framebuffer') diff --git a/framebuffer/fbtk/text.c b/framebuffer/fbtk/text.c index 936f3d213..4749991bb 100644 --- a/framebuffer/fbtk/text.c +++ b/framebuffer/fbtk/text.c @@ -129,7 +129,12 @@ fb_redraw_text(fbtk_widget_t *widget, fbtk_callback_info *cbi ) if (widget->u.text.text != NULL) { int x = bbox.x0 + padding; - int y = bbox.y0 + ((fh * 3) / 4) + padding; + int y = bbox.y0 + ((fh * 3 + 2) / 4) + padding; + +#ifdef FB_USE_FREETYPE + /* Freetype renders text higher */ + y += 1; +#endif if (caret && widget->width - padding - padding < caret_x) { scroll = (widget->width - padding - padding) - caret_x; -- cgit v1.2.3