Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_util.c
Log Message:
handle textblock fixed with and variable height as a result formatting with
min size calcs
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_util.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- edje_util.c 19 Sep 2005 06:53:37 -0000 1.60
+++ edje_util.c 20 Sep 2005 05:49:22 -0000 1.61
@@ -860,10 +860,12 @@
{
Edje_Real_Part *ep;
int w, h;
+ int didw;
ep = l->data;
w = ep->w - ep->req.w;
h = ep->h - ep->req.h;
+ didw = 0;
if (!((ep->chosen_description) &&
(ep->chosen_description->fixed.w)))
{
@@ -872,16 +874,22 @@
maxw = w;
ok = 1;
pep = ep;
+ didw = 1;
}
}
if (!((ep->chosen_description) &&
(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;
- ok = 1;
- pep = ep;
+ if (h > maxh)
+ {
+ maxh = h;
+ ok = 1;
+ pep = ep;
+ }
}
}
}
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
