Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/126141a52ccece200d3a5629f4505935e3175184
...commit
http://git.netsurf-browser.org/netsurf.git/commit/126141a52ccece200d3a5629f4505935e3175184
...tree
http://git.netsurf-browser.org/netsurf.git/tree/126141a52ccece200d3a5629f4505935e3175184
The branch, master has been updated
via 126141a52ccece200d3a5629f4505935e3175184 (commit)
from 0b37b1a7e7299ada3bffac523365d8dcd618859e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/126141a52ccece200d3a5629f4505935e3175184
commit 126141a52ccece200d3a5629f4505935e3175184
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Ensure text is at the right height for Freetype and Internal fonts.
diff --git a/framebuffer/fbtk/text.c b/framebuffer/fbtk/text.c
index 936f3d2..4749991 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;
-----------------------------------------------------------------------
Summary of changes:
framebuffer/fbtk/text.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/framebuffer/fbtk/text.c b/framebuffer/fbtk/text.c
index 936f3d2..4749991 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;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
