enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

Edje min_calc: Don't print the 4000x4000 err when there's a textblock. 

SVN revision: 59112
This commit is contained in:
Tom Hacohen 2011-05-02 10:20:20 +00:00
parent 9d23367627
commit 397acdd837
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
legacy/edje/src/lib/edje_util.c
View File

@ -2152,6 +2152,7 @@ edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Co
int ok; int ok;
int reset_maxwh; int reset_maxwh;
Edje_Real_Part *pep = NULL; Edje_Real_Part *pep = NULL;
Eina_Bool has_non_fixed_tb = EINA_FALSE;
ed = _edje_fetch(obj); ed = _edje_fetch(obj);
if ((!ed) || (!ed->collection)) if ((!ed) || (!ed->collection))
@ -2213,6 +2214,7 @@ edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Co
{ {
w = tb_mw; w = tb_mw;
} }
has_non_fixed_tb = EINA_TRUE;
} }
if (w > maxw) if (w > maxw)
{ {
@ -2234,6 +2236,7 @@ edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Co
ok = 1; ok = 1;
pep = ep; pep = ep;
} }
has_non_fixed_tb = EINA_TRUE;
} }
} }
} }
@ -2247,12 +2250,18 @@ edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Co
} }
if ((ed->w > 4000) || (ed->h > 4000)) if ((ed->w > 4000) || (ed->h > 4000))
{ {
if (pep) /* Only print it if we have a non-fixed textblock.
ERR("file %s, group %s has a non-fixed part '%s'. Adding 'fixed: 1 1;' to source EDC may help. Continuing discarding faulty part.", * We should possibly avoid all of this if in this case, but in
ed->path, ed->group, pep->part->name); * the meanwhile, just doing this. */
else if (!has_non_fixed_tb)
ERR("file %s, group %s overflowed 4000x4000 with minimum size of %dx%d. Continuing discarding faulty parts.", {
ed->path, ed->group, ed->w, ed->h); if (pep)
ERR("file %s, group %s has a non-fixed part '%s'. Adding 'fixed: 1 1;' to source EDC may help. Continuing discarding faulty part.",
ed->path, ed->group, pep->part->name);
else
ERR("file %s, group %s overflowed 4000x4000 with minimum size of %dx%d. Continuing discarding faulty parts.",
ed->path, ed->group, ed->w, ed->h);
}
if (reset_maxwh) if (reset_maxwh)
{ {