Enlightenment CVS committal
Author : barbieri
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_calc.c
Log Message:
Fix edje calculation of max width for swallowed parts.
If you have a SWALLOW part taking the whole window and then swallow an
object with max set using edje_extern_object_max_size_set() it will
not take effect due the comparison of ep->swallow_params.max.w < -1
(desc->max.w is -1 in this case).
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- edje_calc.c 17 Sep 2007 11:33:16 -0000 1.110
+++ edje_calc.c 9 Oct 2007 15:30:26 -0000 1.111
@@ -260,16 +260,18 @@
minw = desc->min.w;
if (ep->swallow_params.min.w > desc->min.w) minw =
ep->swallow_params.min.w;
maxw = desc->max.w;
- if ((ep->swallow_params.max.w >= 0) &&
- (ep->swallow_params.max.w < maxw)) maxw = ep->swallow_params.max.w;
+ if (((ep->swallow_params.max.w >= 0) && (desc->max.w >= 0) &&
+ (ep->swallow_params.max.w < maxw)) ||
+ (ep->swallow_params.max.w >= 0)) maxw = ep->swallow_params.max.w;
}
// if (flags & FLAG_Y)
{
minh = desc->min.h;
if (ep->swallow_params.min.h > desc->min.h) minh =
ep->swallow_params.min.h;
maxh = desc->max.h;
- if ((ep->swallow_params.max.h >= 0) &&
- (ep->swallow_params.max.h < maxh)) maxh = ep->swallow_params.max.h;
+ if (((ep->swallow_params.max.h >= 0) && (desc->max.h >= 0) &&
+ (ep->swallow_params.max.h < maxh)) ||
+ (ep->swallow_params.max.h >= 0)) maxh = ep->swallow_params.max.h;
}
/* relative coords of top left & bottom right */
if (flags & FLAG_X)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
