Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_container.c ewl_filedialog.c ewl_tree.c
Log Message:
Fixup the container resetting.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_container.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- ewl_container.c 25 Nov 2003 07:47:29 -0000 1.54
+++ ewl_container.c 9 Dec 2003 17:19:49 -0000 1.55
@@ -449,14 +449,22 @@
while (c->redirect)
c = c->redirect;
+ if (!c->children)
+ DRETURN(DLEVEL_STABLE);
+
/*
* Loop through removing each child and destroying it.
*/
- while ((w = ewd_list_goto_last(c->children))) {
+ ewd_list_goto_first(c->children);
+ while ((w = ewd_list_current(c->children))) {
if (!ewl_object_has_flags(EWL_OBJECT(w),
EWL_FLAG_PROPERTY_INTERNAL,
- EWL_FLAGS_PROPERTY_MASK))
- ewl_container_remove_child(c, w);
+ EWL_FLAGS_PROPERTY_MASK)) {
+ ewd_list_remove(c->children);
+ ewl_widget_destroy(w);
+ }
+ else
+ ewd_list_next(c->children);
}
DLEAVE_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_filedialog.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_filedialog.c 9 Dec 2003 16:28:30 -0000 1.13
+++ ewl_filedialog.c 9 Dec 2003 17:19:49 -0000 1.14
@@ -142,7 +142,7 @@
fd->selector = ewl_fileselector_new(cb);
ewl_object_set_fill_policy(EWL_OBJECT(fd->selector),
- EWL_FLAG_FILL_FILL);
+ EWL_FLAG_FILL_SHRINK | EWL_FLAG_FILL_FILL);
ewl_container_append_child(EWL_CONTAINER(vbox), fd->selector);
ewl_callback_append (EWL_WIDGET (fd->selector),
EWL_CALLBACK_VALUE_CHANGED, ewl_filedialog_change_labels, fd);
@@ -204,7 +204,7 @@
fd->selector = ewl_fileselector_new(cb);
ewl_object_set_fill_policy(EWL_OBJECT(fd->selector),
- EWL_FLAG_FILL_FILL);
+ EWL_FLAG_FILL_SHRINK | EWL_FLAG_FILL_FILL);
ewl_container_append_child(EWL_CONTAINER(fd), fd->selector);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_tree.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- ewl_tree.c 25 Nov 2003 07:47:29 -0000 1.29
+++ ewl_tree.c 9 Dec 2003 17:19:49 -0000 1.30
@@ -425,6 +425,9 @@
if (node->expanded == EWL_TREE_NODE_COLLAPSED)
DRETURN(DLEVEL_STABLE);
+ if (!EWL_CONTAINER(node)->children)
+ DRETURN(DLEVEL_STABLE);
+
ewd_list_goto_first(EWL_CONTAINER(node)->children);
ewd_list_next(EWL_CONTAINER(node)->children);
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
