enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

Revert "Edje min_restricted_calc: Fixed min height calculation for textblock." 

This reverts commit 60239

I guess the world is not ready for correct min height calculation, too
many things depend on the current behavior. Will re-apply sometime in
the future.

SVN revision: 60264
This commit is contained in:
Tom Hacohen 2011-06-13 09:31:58 +00:00
parent 937cbfe675
commit 92bf12c773
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2284,18 +2284,6 @@ edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Co
(!((Edje_Part_Description_Text *)ep->chosen_description)->text.min_x) &&
(didw)))
{
if ((ep->part->type == EDJE_PART_TYPE_TEXTBLOCK))
{
Evas_Coord tb_mh;
evas_object_textblock_size_formatted_get(
ep->object, NULL, &tb_mh);
tb_mh -= ep->req.h;
if (tb_mh > h)
{
h = tb_mh;
}
has_non_fixed_tb = EINA_TRUE;
}
if (h > maxh)
{
maxh = h;
@ -2303,6 +2291,11 @@ edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Co
pep = ep;
}
}
if (ep->part->type == EDJE_PART_TYPE_TEXTBLOCK)
{
has_non_fixed_tb = EINA_TRUE;
}
}
}
}