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

handle textblock fixed with and variable height as a result formatting with 

min size calcs


SVN revision: 16780
This commit is contained in:
Carsten Haitzler 2005-09-20 05:49:22 +00:00
parent 8de24f02e4
commit d9933843b6
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -860,10 +860,12 @@ edje_object_size_min_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
{ {
Edje_Real_Part *ep; Edje_Real_Part *ep;
int w, h; int w, h;
int didw;
ep = l->data; ep = l->data;
w = ep->w - ep->req.w; w = ep->w - ep->req.w;
h = ep->h - ep->req.h; h = ep->h - ep->req.h;
didw = 0;
if (!((ep->chosen_description) && if (!((ep->chosen_description) &&
(ep->chosen_description->fixed.w))) (ep->chosen_description->fixed.w)))
{ {
@ -872,16 +874,22 @@ edje_object_size_min_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
maxw = w; maxw = w;
ok = 1; ok = 1;
pep = ep; pep = ep;
didw = 1;
} }
} }
if (!((ep->chosen_description) && if (!((ep->chosen_description) &&
(ep->chosen_description->fixed.h))) (ep->chosen_description->fixed.h)))
{ {
if (h > maxh) if (!((ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) &&
(!ep->chosen_description->text.min_x) &&
(didw)))
{ {
maxh = h; if (h > maxh)
ok = 1; {
pep = ep; maxh = h;
ok = 1;
pep = ep;
}
} }
} }
} }