forked from enlightenment/efl
evas textblock: use main font's ascent/descent as minimum value
Summary: The patch will adjust ascent/descent with considering main font's ascent/descent as minimum value. Actually, this patch re-apply D5217 with resolving linegap issue on the _layout_format_ascent_descent_adjust() function. @fix Test Plan: Put a text which will load smaller font. And put a text which will load primary font. Reviewers: raster, cedric, herdsman, jpeg Differential Revision: https://phab.enlightenment.org/D5227
This commit is contained in:
parent
56667a84b1
commit
42ac2136b0
|
@ -3032,18 +3032,21 @@ _layout_item_ascent_descent_adjust(Evas_Object_Protected_Data *obj,
|
|||
}
|
||||
}
|
||||
|
||||
if (fi)
|
||||
{
|
||||
asc = evas_common_font_instance_ascent_get(fi);
|
||||
desc = evas_common_font_instance_descent_get(fi);
|
||||
}
|
||||
|
||||
else if (fmt)
|
||||
if (fmt)
|
||||
{
|
||||
asc = ENFN->font_ascent_get(ENC, fmt->font.font);
|
||||
desc = ENFN->font_descent_get(ENC, fmt->font.font);
|
||||
}
|
||||
|
||||
if (fi)
|
||||
{
|
||||
int fi_asc = evas_common_font_instance_ascent_get(fi);
|
||||
int fi_desc = evas_common_font_instance_descent_get(fi);
|
||||
|
||||
if (fi_asc > asc) asc = fi_asc;
|
||||
if (fi_desc > desc) desc = fi_desc;
|
||||
}
|
||||
|
||||
if (fmt) _layout_format_ascent_descent_adjust(obj, &asc, &desc, fmt);
|
||||
|
||||
if (asc > *ascent) *ascent = asc;
|
||||
|
|
Loading…
Reference in New Issue