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

BLF: correct ResultBLF.width value when wrapping

Browse Source
This commit is contained in:
Campbell Barton 2015-09-19 14:45:56 +10:00
parent e6a413b1ec
commit cb27d38cf4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -670,6 +670,7 @@ static void blf_font_wrap_apply(
size_t i = 0;
GlyphBLF **glyph_ascii_table = font->glyph_cache->glyph_ascii_table;
int lines = 0;
int pen_x_next = 0;
BLF_KERNING_VARS(font, has_kerning, kern_mode);
@ -684,7 +685,6 @@ static void blf_font_wrap_apply(
/* wrap vars */
size_t i_curr = i;
int pen_x_next;
bool do_draw = false;
BLF_UTF8_NEXT_FAST(font, g, str, i, c, glyph_ascii_table);
@ -745,7 +745,7 @@ static void blf_font_wrap_apply(
if (r_info) {
r_info->lines = lines;
/* width of last line only (with wrapped lines) */
r_info->width = pen_x;
r_info->width = pen_x_next;
}
}