dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

edje: fix float comparison warning in edje text logic.

This commit is contained in:
Cedric BAIL 2016-12-20 16:01:01 -08:00
parent 14d7ec478c
commit 48fb9856c0
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/edje/edje_entry.c
View File

@ -2582,7 +2582,7 @@ _edje_part_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_
d = (r2->y + (r2->h / 2)) - cy;
d2 += d * d;
sc = DIV(en->ed->scale, en->ed->file->base_scale);
if (sc == ZERO) sc = DIV(_edje_scale, en->ed->file->base_scale);
if (EQ(sc, ZERO)) sc = DIV(_edje_scale, en->ed->file->base_scale);
d = (Evas_Coord)MUL(FROM_INT(20), sc); // FIXME: maxing number!
d = d * d;
if (d1 < d2)

10
src/lib/edje/edje_text.c
View File

@ -125,7 +125,7 @@ _edje_text_fit_x(Edje *ed, Edje_Real_Part *ep,
FLOAT_T sc;
sc = DIV(ed->scale, ed->file->base_scale);
if (sc == ZERO) sc = DIV(_edje_scale, ed->file->base_scale);
if (EQ(sc, ZERO)) sc = DIV(_edje_scale, ed->file->base_scale);
*free_text = 0;
if (sw <= 1) return "";
@ -217,7 +217,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
if ((ep->type != EDJE_RP_TYPE_TEXT) ||
(!ep->typedata.text)) return;
sc = DIV(ed->scale, ed->file->base_scale);
if (sc == ZERO) sc = DIV(_edje_scale, ed->file->base_scale);
if (EQ(sc, ZERO)) sc = DIV(_edje_scale, ed->file->base_scale);
if (chosen_desc->text.domain)
{
@ -310,9 +310,9 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
(ep->typedata.text->cache.in_h == sh) &&
(ep->typedata.text->cache.in_str) &&
same_text &&
(ep->typedata.text->cache.align_x == params->type.text->align.x) &&
(ep->typedata.text->cache.align_y == params->type.text->align.y) &&
(ep->typedata.text->cache.ellipsis == params->type.text->ellipsis) &&
(EQ(ep->typedata.text->cache.align_x, params->type.text->align.x)) &&
(EQ(ep->typedata.text->cache.align_y, params->type.text->align.y)) &&
(EQ(ep->typedata.text->cache.ellipsis, params->type.text->ellipsis)) &&
(ep->typedata.text->cache.fit_x == chosen_desc->text.fit_x) &&
(ep->typedata.text->cache.fit_y == chosen_desc->text.fit_y) &&
(ep->typedata.text->cache.in_font == font))

2
src/lib/edje/edje_textblock_styles.c
View File

@ -220,7 +220,7 @@ _edje_textblock_style_update(Edje *ed, Edje_Style *stl, Eina_Bool force)
eina_strbuf_append(txt, "font_source=");
eina_strbuf_append(txt, fontsource);
}
if (tag->font_size != 0)
if (!EINA_DBL_CMP(tag->font_size, 0))
{
char font_size[32];