Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/src


Modified Files:
        ewl_tree.c ewl_widget.c ewl_widget.h 


Log Message:
More tree work. Also added a field to the widget to track the current bit
state.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_tree.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_tree.c  2 Apr 2003 20:36:20 -0000       1.8
+++ ewl_tree.c  3 Apr 2003 01:13:44 -0000       1.9
@@ -4,10 +4,15 @@
 static void __ewl_tree_child_resize(Ewl_Container *c, Ewl_Widget *w, int size,
                Ewl_Orientation o);
 static void __ewl_tree_configure(Ewl_Widget *w, void *ev_data, void *user_data);
+
+
 static void __ewl_tree_node_configure(Ewl_Widget * w, void *ev_data,
                void *user_data);
 static void __ewl_tree_node_clicked(Ewl_Widget * w, void *ev_data,
                void *user_data);
+static void __ewl_tree_node_theme_update(Ewl_Widget * w, void *ev_data,
+               void *user_data);
+
 
 static void __ewl_tree_node_add(Ewl_Container *c, Ewl_Widget *w);
 static void __ewl_tree_node_remove(Ewl_Container *c, Ewl_Widget *w);
@@ -308,6 +313,8 @@
 
        ewl_callback_append(EWL_WIDGET(node), EWL_CALLBACK_CONFIGURE,
                        __ewl_tree_node_configure, NULL);
+       ewl_callback_append(EWL_WIDGET(node), EWL_CALLBACK_THEME_UPDATE,
+                       __ewl_tree_node_theme_update, NULL);
        ewl_callback_append(EWL_WIDGET(node), EWL_CALLBACK_CLICKED,
                        __ewl_tree_node_clicked, NULL);
 
@@ -339,7 +346,7 @@
 
        node->expanded = FALSE;
 
-       ewl_widget_update_appearance(EWL_WIDGET(node), "collapsed");
+       __ewl_tree_node_theme_update(EWL_WIDGET(node), NULL, NULL);
 
        DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
@@ -369,7 +376,7 @@
                ewl_widget_show(w);
        }
 
-       ewl_widget_update_appearance(EWL_WIDGET(node), "expanded");
+       __ewl_tree_node_theme_update(EWL_WIDGET(node), NULL, NULL);
 
        DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
@@ -486,6 +493,22 @@
                ewl_tree_node_collapse(node);
        else
                ewl_tree_node_expand(node);
+
+       DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+static void
+__ewl_tree_node_theme_update(Ewl_Widget * w, void *ev_data, void *user_data)
+{
+       Ewl_Tree_Node *node;
+
+       DENTER_FUNCTION(DLEVEL_STABLE);
+
+       node = EWL_TREE_NODE(w);
+       if (node->expanded)
+               ewl_widget_update_appearance(w, "expanded");
+       else
+               ewl_widget_update_appearance(w, "collapsed");
 
        DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_widget.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- ewl_widget.c        1 Apr 2003 17:42:46 -0000       1.50
+++ ewl_widget.c        3 Apr 2003 01:13:44 -0000       1.51
@@ -417,16 +417,19 @@
        DCHECK_PARAM_PTR("w", w);
        DCHECK_PARAM_PTR("state", state);
 
-       /*
-        * Set up the ebits object on the widgets evas
-        */
-       if (!w->ebits_object)
-               ewl_widget_theme_update(w);
-
-       if (!w->ebits_object)
+       if (w->bit_state && !strcmp(w->bit_state, state))
                DRETURN(DLEVEL_STABLE);
 
-       ebits_set_named_bit_state(w->ebits_object, "Base", state);
+       IF_FREE(w->bit_state);
+       w->bit_state = strdup(state);
+
+       if (w->ebits_object)
+               ebits_set_named_bit_state(w->ebits_object, "Base", state);
+
+       /*
+        * Allow widgets to catch the change in appearance
+        */
+       ewl_widget_theme_update(w);
 
        DRETURN(DLEVEL_STABLE);
 }
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_widget.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewl_widget.h        25 Mar 2003 18:36:22 -0000      1.25
+++ ewl_widget.h        3 Apr 2003 01:13:44 -0000       1.26
@@ -22,6 +22,7 @@
        Evas_Object    *fx_clip_box;
 
        Ebits_Object   *ebits_object;
+       char           *bit_state;
        char           *appearance;
        int             layer;
 




-------------------------------------------------------
This SF.net email is sponsored by: ValueWeb: 
Dedicated Hosting for just $79/mo with 500 GB of bandwidth! 
No other company gives more support or power for your dedicated server
http://click.atdmt.com/AFF/go/sdnxxaff00300020aff/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to