Enlightenment CVS committal
Author : ningerso
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests/object
Modified Files:
ewl_object_test.c
Log Message:
Check for minimum and maximum impact on current size checks.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/object/ewl_object_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_object_test.c 12 Dec 2007 22:23:58 -0000 1.6
+++ ewl_object_test.c 14 Dec 2007 06:06:54 -0000 1.7
@@ -373,20 +373,29 @@
int ret = 0;
w = ewl_widget_new();
+ ewl_object_size_request(EWL_OBJECT(w), MATCH_SIZE - 1,
+ MATCH_SIZE - 1);
ewl_object_minimum_size_get(EWL_OBJECT(w), &width, &height);
if (width == EWL_OBJECT_MIN_SIZE && height == EWL_OBJECT_MIN_SIZE) {
- ewl_object_minimum_size_set(EWL_OBJECT(w), MATCH_SIZE,
- MATCH_SIZE);
+ ewl_object_minimum_size_set(EWL_OBJECT(w), DIFFER_WIDTH,
+ DIFFER_HEIGHT);
ewl_object_minimum_size_get(EWL_OBJECT(w), &width, &height);
- if (width == MATCH_SIZE && height == MATCH_SIZE) {
+ if (width == DIFFER_WIDTH && height == DIFFER_HEIGHT) {
ewl_object_minimum_size_set(EWL_OBJECT(w),
- DIFFER_WIDTH,
- DIFFER_HEIGHT);
+ MATCH_SIZE,
+ MATCH_SIZE);
ewl_object_minimum_size_get(EWL_OBJECT(w), &width,
&height);
- if (width == DIFFER_WIDTH && height == DIFFER_HEIGHT)
- ret = 1;
+ if (width == MATCH_SIZE && height == MATCH_SIZE) {
+ ewl_object_current_size_get(EWL_OBJECT(w),
+ &width, &height);
+ if (width == MATCH_SIZE && height == MATCH_SIZE)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len,
+ "current size wrong");
+ }
else
LOG_FAILURE(buf, len, "minimum sizes match");
}
@@ -414,6 +423,8 @@
int ret = 0;
w = ewl_widget_new();
+ ewl_object_size_request(EWL_OBJECT(w), DIFFER_WIDTH + 1,
+ DIFFER_HEIGHT + 1);
ewl_object_maximum_size_get(EWL_OBJECT(w), &width, &height);
if (width == EWL_OBJECT_MAX_SIZE && height == EWL_OBJECT_MAX_SIZE) {
@@ -426,8 +437,16 @@
DIFFER_HEIGHT);
ewl_object_maximum_size_get(EWL_OBJECT(w), &width,
&height);
- if (width == DIFFER_WIDTH && height == DIFFER_HEIGHT)
- ret = 1;
+ if (width == DIFFER_WIDTH && height == DIFFER_HEIGHT) {
+ ewl_object_current_size_get(EWL_OBJECT(w),
+ &width, &height);
+ if (width == DIFFER_WIDTH &&
+ height == DIFFER_HEIGHT)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len,
+ "current size wrong");
+ }
else
LOG_FAILURE(buf, len, "maximum sizes match");
}
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
