Enlightenment CVS committal
Author : rephorm
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_calc.c
Log Message:
if requested scroll size is less than min, use min size.
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -3 -r1.98 -r1.99
--- edje_calc.c 3 May 2007 23:15:09 -0000 1.98
+++ edje_calc.c 24 May 2007 03:41:04 -0000 1.99
@@ -834,8 +834,11 @@
if (flags & FLAG_X)
{
v = ep->drag.size.x * confine_to->w;
- if ((((minw > 0) && (v > minw)) || (minw <= 0)) &&
- (((maxw >= 0) && (v < maxw)) || (maxw < 0))) params->w = v;
+
+ if ((minw > 0) && (v < minw)) params->w = minw;
+ else if ((maxw >= 0) && (v > maxw)) params->w = maxw;
+ else params->w = v;
+
offset = (ep->drag.x * (confine_to->w - params->w)) +
ep->drag.tmp.x;
if (ep->part->dragable.step_x > 0)
@@ -856,8 +859,11 @@
if (flags & FLAG_Y)
{
v = ep->drag.size.y * confine_to->h;
- if ((((minh > 0) && (v > minh)) || (minh <= 0)) &&
- (((maxh >= 0) && (v < maxh)) || (maxh < 0))) params->h = v;
+
+ if ((minh > 0) && (v < minh)) params->h = minh;
+ else if ((maxh >= 0) && (v > maxh)) params->h = maxh;
+ else params->h = v;
+
offset = (ep->drag.y * (confine_to->h - params->h)) +
ep->drag.tmp.y;
if (ep->part->dragable.step_y > 0)
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
