sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Revert a small change to kerning, Matt please let me know if now it's fine (or like before).

Browse Source
This commit is contained in:
Diego Borghetti 2009-06-18 20:45:58 +00:00
parent 2269280910
commit 96003b5b73
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenfont/intern/blf_font.c
View File

@ -146,18 +146,20 @@ void blf_font_draw(FontBLF *font, char *str)
if (FT_Get_Kerning(font->face, g_prev_index, glyph_index, FT_KERNING_UNFITTED, &delta) == 0) {
pen_x += delta.x >> 6;
/*
if (pen_x < old_pen_x)
pen_x= old_pen_x;
*/
}
}
if (font->flags & BLF_USER_KERNING) {
old_pen_x= pen_x;
pen_x += font->kerning;
/*
if (pen_x < old_pen_x)
pen_x= old_pen_x;
*/
}
/* do not return this loop if clipped, we want every character tested */
@ -226,18 +228,20 @@ void blf_font_boundbox(FontBLF *font, char *str, rctf *box)
if (FT_Get_Kerning(font->face, g_prev_index, glyph_index, FT_KERNING_UNFITTED, &delta) == 0) {
pen_x += delta.x >> 6;
/*
if (pen_x < old_pen_x)
old_pen_x= pen_x;
*/
}
}
if (font->flags & BLF_USER_KERNING) {
old_pen_x= pen_x;
pen_x += font->kerning;
/*
if (pen_x < old_pen_x)
old_pen_x= pen_x;
*/
}
gbox.xmin= g->box.xmin + pen_x;