Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_object.c ewl_widget.c
Log Message:
do some bounds checking on width/height values
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_object.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- ewl_object.c 18 Aug 2004 03:15:20 -0000 1.59
+++ ewl_object.c 1 Sep 2004 04:18:54 -0000 1.60
@@ -653,6 +653,9 @@
DRETURN(DLEVEL_STABLE);
}
+ if (w < EWL_OBJECT_MIN_SIZE)
+ w = EWL_OBJECT_MIN_SIZE;
+
old_size = MINIMUM_W(o);
new_size = MINIMUM_W(o) = w;
@@ -694,6 +697,9 @@
DRETURN(DLEVEL_STABLE);
}
+ if (h < EWL_OBJECT_MIN_SIZE)
+ h = EWL_OBJECT_MIN_SIZE;
+
old_size = MINIMUM_H(o);
new_size = MINIMUM_H(o) = h;
@@ -858,6 +864,9 @@
DRETURN(DLEVEL_STABLE);
}
+ if (w > EWL_OBJECT_MAX_SIZE)
+ w = EWL_OBJECT_MAX_SIZE;
+
MAXIMUM_W(o) = w;
if (MINIMUM_W(o) > w)
@@ -893,6 +902,9 @@
DRETURN(DLEVEL_STABLE);
}
+ if (h > EWL_OBJECT_MAX_SIZE)
+ h = EWL_OBJECT_MAX_SIZE;
+
o->maximum.h = h;
if (MINIMUM_H(o) > h)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_widget.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -3 -r1.122 -r1.123
--- ewl_widget.c 23 Aug 2004 18:51:53 -0000 1.122
+++ ewl_widget.c 1 Sep 2004 04:18:54 -0000 1.123
@@ -1111,10 +1111,12 @@
i_l = (int)(width);
i_t = (int)(height);
- if (i_l > 0 && MINIMUM_W(w) == EWL_OBJECT_MIN_SIZE)
+ if (i_l > 0 && MINIMUM_W(w) == EWL_OBJECT_MIN_SIZE
+ && i_l > EWL_OBJECT_MIN_SIZE && i_l <=
EWL_OBJECT_MAX_SIZE)
ewl_object_minimum_w_set(EWL_OBJECT(w), i_l);
- if (i_t > 0 && MINIMUM_H(w) == EWL_OBJECT_MIN_SIZE)
+ if (i_t > 0 && MINIMUM_H(w) == EWL_OBJECT_MIN_SIZE
+ && i_t > EWL_OBJECT_MIN_SIZE && i_t <=
EWL_OBJECT_MAX_SIZE)
ewl_object_minimum_h_set(EWL_OBJECT(w), i_t);
/*
@@ -1124,10 +1126,12 @@
i_l = (int)(width);
i_t = (int)(height);
- if (i_l > 0 && MAXIMUM_W(w) == EWL_OBJECT_MAX_SIZE)
+ if (i_l > 0 && MAXIMUM_W(w) == EWL_OBJECT_MAX_SIZE
+ && i_l >= EWL_OBJECT_MIN_SIZE && i_l <
EWL_OBJECT_MAX_SIZE)
ewl_object_maximum_w_set(EWL_OBJECT(w), i_l);
- if (i_t > 0 && MAXIMUM_H(w) == EWL_OBJECT_MAX_SIZE)
+ if (i_t > 0 && MAXIMUM_H(w) == EWL_OBJECT_MAX_SIZE
+ && i_t >= EWL_OBJECT_MIN_SIZE && i_t <
EWL_OBJECT_MAX_SIZE)
ewl_object_maximum_h_set(EWL_OBJECT(w), i_t);
}
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs