blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

BLF: add new arguments to BLF_GlyphBoundsFn 

- glyph_bounds: to get the character width.
- glyph_bearing: lower left character starting point.

These values are needed for more precise glyph calculations.
This commit is contained in:
Campbell Barton 2020-05-03 16:51:34 +10:00
parent d388c1c524
commit 0d65520f05
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenfont/BLF_api.h
View File

@ -117,9 +117,11 @@ void BLF_draw_ascii(int fontid, const char *str, size_t len) ATTR_NONNULL(2);
int BLF_draw_mono(int fontid, const char *str, size_t len, int cwidth) ATTR_NONNULL(2);
typedef bool (*BLF_GlyphBoundsFn)(const char *str,
const size_t str_ofs,
const struct rcti *glyph_bounds,
const size_t str_step_ofs,
const struct rcti *glyph_step_bounds,
const int glyph_advance_x,
const struct rctf *glyph_bounds,
const float glyph_bearing[2],
void *user_data);
void BLF_boundbox_foreach_glyph_ex(int fontid,

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

@ -1252,7 +1252,7 @@ static void blf_font_boundbox_foreach_glyph_ex(FontBLF *font,
pen_x += g->advance_i;
if (user_fn(str, i_curr, &gbox, g->advance_i, user_data) == false) {
if (user_fn(str, i_curr, &gbox, g->advance_i, &g->box, &g->pos_x, user_data) == false) {
break;
}

6
source/blender/blenfont/intern/blf_internal.h
View File

@ -103,9 +103,11 @@ void blf_font_boundbox_foreach_glyph(struct FontBLF *font,
const char *str,
size_t len,
bool (*user_fn)(const char *str,
const size_t str_ofs,
const struct rcti *glyph_bounds,
const size_t str_step_ofs,
const struct rcti *glyph_step_bounds,
const int glyph_advance_x,
const struct rctf *glyph_bounds,
const float glyph_bearing[2],
void *user_data),
void *user_data,
struct ResultBLF *r_info);

10
source/blender/editors/interface/interface_widgets.c
View File

@ -2095,15 +2095,17 @@ static void widget_draw_text_ime_underline(const uiFontStyle *fstyle,
#endif /* WITH_INPUT_IME */
static bool widget_draw_text_underline_calc_center_x(const char *UNUSED(str),
const size_t str_ofs,
const rcti *glyph_bounds,
const size_t str_step_ofs,
const rcti *glyph_step_bounds,
const int glyph_advance_x,
const rctf *UNUSED(glyph_bounds),
const float UNUSED(glyph_bearing[2]),
void *user_data)
{
/* The index of the character to get, set to the x-position. */
int *ul_data = user_data;
if (ul_data[0] == (int)str_ofs) {
ul_data[1] = glyph_bounds->xmin + (glyph_advance_x / 2);
if (ul_data[0] == (int)str_step_ofs) {
ul_data[1] = glyph_step_bounds->xmin + (glyph_advance_x / 2);
/* Early exit. */
return false;
}