Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/src/lib


Modified Files:
        Ewl.h Makefile.am ewl_tree2.c ewl_tree2.h 
Added Files:
        ewl_tree2_view.c ewl_tree2_view.h ewl_tree2_view_plain.c 
        ewl_tree2_view_plain.h ewl_tree2_view_scrolled.c 
        ewl_tree2_view_scrolled.h 


Log Message:
- convert tree2 to use a view system similar to the filedialog
- there are currently two views available plain and scrolled, scrolled is
  default
- you can write your own view if you desire to get a custom tree row
  handling if needed (something like a spreadsheet to display row numbers or
  something)

- NOTE: when moving the headers inside the scrolled view there is a missing
  configure. you need to force a configure (resize or move window) in order
  for the row sizes to correct. this works correctly in the normal case.


===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/Ewl.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Ewl.h       16 Aug 2006 15:04:50 -0000      1.8
+++ Ewl.h       22 Aug 2006 21:41:45 -0000      1.9
@@ -336,6 +336,9 @@
 
 #include <ewl_tree.h>
 #include <ewl_tree2.h>
+#include <ewl_tree2_view.h>
+#include <ewl_tree2_view_plain.h>
+#include <ewl_tree2_view_scrolled.h>
 #include <ewl_list.h>
 
 #ifdef __cplusplus
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- Makefile.am 16 Aug 2006 15:04:50 -0000      1.31
+++ Makefile.am 22 Aug 2006 21:41:45 -0000      1.32
@@ -79,6 +79,9 @@
        ewl_table.h \
        ewl_tree.h \
        ewl_tree2.h \
+       ewl_tree2_view.h \
+       ewl_tree2_view_plain.h \
+       ewl_tree2_view_scrolled.h \
        ewl_theme.h \
        ewl_view.h \
        ewl_widget.h \
@@ -151,6 +154,9 @@
        ewl_theme.c \
        ewl_tree.c \
        ewl_tree2.c \
+       ewl_tree2_view.c \
+       ewl_tree2_view_plain.c \
+       ewl_tree2_view_scrolled.c \
        ewl_view.c \
        ewl_widget.c \
        ewl_window.c \
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- ewl_tree2.c 22 Aug 2006 05:37:09 -0000      1.30
+++ ewl_tree2.c 22 Aug 2006 21:41:45 -0000      1.31
@@ -45,12 +45,13 @@
        DENTER_FUNCTION(DLEVEL_STABLE);
        DCHECK_PARAM_PTR_RET("tree", tree, FALSE);
 
-       if (!ewl_container_init(EWL_CONTAINER(tree)))
+       if (!ewl_box_init(EWL_BOX(tree)))
                DRETURN_INT(FALSE, DLEVEL_STABLE);
 
        ewl_widget_appearance_set(EWL_WIDGET(tree), EWL_TREE2_TYPE);
        ewl_widget_inherit(EWL_WIDGET(tree), EWL_TREE2_TYPE);
 
+       ewl_box_orientation_set(EWL_BOX(tree), EWL_ORIENTATION_VERTICAL);
        ewl_object_fill_policy_set(EWL_OBJECT(tree), 
                                EWL_FLAG_FILL_SHRINK | EWL_FLAG_FILL_FILL);
 
@@ -62,22 +63,13 @@
        tree->header = ewl_hpaned_new();
        ewl_container_child_append(EWL_CONTAINER(tree), tree->header);
        ewl_widget_appearance_set(EWL_WIDGET(tree->header), "tree_header");
-       ewl_object_fill_policy_set(EWL_OBJECT(tree->header), 
-                               EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_VSHRINK);
+       ewl_object_fill_policy_set(EWL_OBJECT(tree->header), 
EWL_FLAG_FILL_HFILL);
        ewl_callback_append(tree->header, EWL_CALLBACK_VALUE_CHANGED,
                                        ewl_tree2_cb_header_changed, tree);
        ewl_widget_show(tree->header);
 
-       tree->scroll_headers = FALSE;
-       tree->scroll_visible = TRUE;
-
-       tree->scroll = ewl_scrollpane_new();
-       ewl_container_child_append(EWL_CONTAINER(tree), tree->scroll);
-       ewl_widget_show(tree->scroll);
-
-       tree->rows = ewl_vbox_new();
-       ewl_container_child_append(EWL_CONTAINER(tree->scroll), tree->rows);
-       ewl_widget_show(tree->rows);
+       /* set the default row view */
+       ewl_tree2_view_set(tree, ewl_tree2_view_scrolled_get());
 
        ewl_tree2_headers_visible_set(tree, TRUE);
        ewl_tree2_fixed_rows_set(tree, FALSE);
@@ -94,6 +86,54 @@
 }
 
 /**
+ * @param t: The tree to work with
+ * @param view: The view to set on the tree
+ * @return Returns no value
+ * @brief Sets the current view of the tree rows
+ */
+void
+ewl_tree2_view_set(Ewl_Tree2 *t, Ewl_View *view)
+{
+       DENTER_FUNCTION(DLEVEL_STABLE);
+       DCHECK_PARAM_PTR("t", t);
+       DCHECK_PARAM_PTR("view", view);
+       DCHECK_TYPE("t", t, EWL_TREE2_TYPE);
+
+       if (t->view == view)
+               DRETURN(DLEVEL_STABLE);
+
+       t->view = view;
+
+       /* destroy the old view, create a new one and redisplay the tree */
+       if (t->rows) ewl_widget_destroy(t->rows);
+
+       t->rows = view->construct();
+       ewl_tree2_view_tree2_set(EWL_TREE2_VIEW(t->rows), t);
+       ewl_container_child_append(EWL_CONTAINER(t), t->rows);
+       ewl_widget_show(t->rows);
+
+       ewl_tree2_dirty_set(t, TRUE);
+       ewl_widget_configure(EWL_WIDGET(t));
+
+       DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
+ * @param t: The tree to work with
+ * @return Returns the current view set on the tree
+ * @brief Retrieves the current view used for the tree
+ */
+Ewl_View *
+ewl_tree2_view_get(Ewl_Tree2 *t)
+{
+       DENTER_FUNCTION(DLEVEL_STABLE);
+       DCHECK_PARAM_PTR_RET("t", t, NULL);
+       DCHECK_TYPE_RET("t", t, EWL_TREE2_TYPE, NULL);
+
+       DRETURN_PTR(t->view, DLEVEL_STABLE);
+}
+
+/**
  * @param tree: The Ewl_Tree to set the data into
  * @param data: The data to set into the tree
  * @return Returns no value.
@@ -458,96 +498,14 @@
        DRETURN_INT(tree2->dirty, DLEVEL_STABLE);
 }
 
-/**
- * @param tree: The tree to work with
- * @param visible: The value to set the scroll visible setting too
- * @return Returns no value
- * @brief Sets if the scrollpane is visible in the tree or not
- */
-void
-ewl_tree2_scroll_visible_set(Ewl_Tree2 *tree, unsigned int visible)
+Ewl_Widget *
+ewl_tree2_view_widget_get(Ewl_Tree2 *tree)
 {
        DENTER_FUNCTION(DLEVEL_STABLE);
-       DCHECK_PARAM_PTR("tree", tree);
-       DCHECK_TYPE("tree", tree, EWL_TREE2_TYPE);
-
-       if (tree->scroll_visible == visible)
-               DRETURN(DLEVEL_STABLE);
-
-       tree->scroll_visible = visible;
-       if (tree->scroll_visible)
-       {
-               
ewl_scrollpane_hscrollbar_flag_set(EWL_SCROLLPANE(tree->scroll), 
-                                               
EWL_SCROLLPANE_FLAG_AUTO_VISIBLE);
-               
ewl_scrollpane_vscrollbar_flag_set(EWL_SCROLLPANE(tree->scroll), 
-                                               
EWL_SCROLLPANE_FLAG_AUTO_VISIBLE);
-       }
-       else
-       {
-               
ewl_scrollpane_hscrollbar_flag_set(EWL_SCROLLPANE(tree->scroll), 
-                                               
EWL_SCROLLPANE_FLAG_ALWAYS_HIDDEN);
-               
ewl_scrollpane_vscrollbar_flag_set(EWL_SCROLLPANE(tree->scroll), 
-                                               
EWL_SCROLLPANE_FLAG_ALWAYS_HIDDEN);
-       }
-
-       DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @param tree: The tree to work with
- * @return Returns if the scrollarea is visible in the tree
- * @brief Returns TRUE if the scrollarea is visible else returns FALSE
- */
-unsigned int
-ewl_tree2_scroll_visible_get(Ewl_Tree2 *tree)
-{
-       DENTER_FUNCTION(DLEVEL_STABLE);
-       DCHECK_PARAM_PTR_RET("tree", tree, FALSE);
-       DCHECK_TYPE_RET("tree", tree, EWL_TREE2_TYPE, FALSE);
-
-       DRETURN_INT(tree->scroll_visible, DLEVEL_STABLE);
-}
-
-/**
- * @param tree: The tree to work with
- * @param scroll: If the headers should be scrolled
- * @return Returns no value
- * @brief Sets if the headers should be scrolled with the tree
- */
-void
-ewl_tree2_scroll_headers_set(Ewl_Tree2 *tree, unsigned int scroll)
-{
-       DENTER_FUNCTION(DLEVEL_STABLE);
-       DCHECK_PARAM_PTR("tree", tree);
-       DCHECK_TYPE("tree", tree, EWL_TREE2_TYPE);
-
-       if (tree->scroll_headers == scroll)
-               DRETURN(DLEVEL_STABLE);
-
-       tree->scroll_headers = scroll;
-       if (tree->scroll_headers)
-               ewl_container_child_prepend(EWL_CONTAINER(tree->scroll),
-                                                       tree->header);
-       else
-               ewl_container_child_prepend(EWL_CONTAINER(tree),
-                                                       tree->header);
-
-       DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @param tree: The tree to work with
- * @return Returns no value
- * @brief Retrieves if the tree headers will be scrolled or not
- */
-unsigned int
-ewl_tree2_scroll_headers_get(Ewl_Tree2 *tree)
-{
-       DENTER_FUNCTION(DLEVEL_STABLE);
-       DCHECK_PARAM_PTR_RET("tree", tree, FALSE);
-       DCHECK_TYPE_RET("tree", tree, EWL_TREE2_TYPE, FALSE);
+       DCHECK_PARAM_PTR_RET("tree", tree, NULL);
+       DCHECK_TYPE_RET("tree", tree, EWL_TREE2_TYPE, NULL);
 
-       DRETURN_INT(tree->scroll_headers, DLEVEL_STABLE);
+       DRETURN_PTR(tree->rows, DLEVEL_STABLE);
 }
 
 /**
@@ -588,30 +546,12 @@
                                        void *data __UNUSED__)
 {
        Ewl_Tree2 *tree;
-       int size = 0;
 
        DENTER_FUNCTION(DLEVEL_STABLE);
        DCHECK_PARAM_PTR("w", w);
        DCHECK_TYPE("w", w, EWL_TREE2_TYPE);
 
        tree = EWL_TREE2(w);
-
-       /* place the header */
-       if (!tree->scroll_headers)
-       {
-               ewl_object_place(EWL_OBJECT(tree->header), CURRENT_X(tree), 
-                                       CURRENT_Y(tree), CURRENT_W(tree), 
-                                       CURRENT_H(tree));
-
-               size = ewl_object_current_h_get(EWL_OBJECT(tree->header));
-       }
-
-       /* place the rows */
-       ewl_object_place(EWL_OBJECT(tree->scroll), CURRENT_X(tree),
-                               CURRENT_Y(tree) + size,
-                               CURRENT_W(tree),
-                               CURRENT_H(tree) - size);
-
 
        /* if the tree isn't dirty we're done */
        if (!ewl_tree2_dirty_get(tree)) 
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ewl_tree2.h 21 Aug 2006 01:24:07 -0000      1.27
+++ ewl_tree2.h 22 Aug 2006 21:41:45 -0000      1.28
@@ -113,11 +113,11 @@
  */
 struct Ewl_Tree2
 {
-       Ewl_Container container; /**< Inherit from container. */
+       Ewl_Box box;            /**< Inherit from ewl_box. */
 
        Ewl_Widget *header;      /**< The tree header */
-       Ewl_Widget *rows;        /**< Holds the rows of the tree */
-       Ewl_Widget *scroll;     /**< Holds the scrollpane */
+       Ewl_Widget *rows;        /**< The rows of the tree */
+       Ewl_View *view;          /**< Holds the view of the tree */
 
        Ecore_List *columns;     /**< The tree columns. */
        void *data;              /**< Data provided to the tree */
@@ -129,8 +129,6 @@
 
        unsigned char fixed:1;    /**< Rows are fixed height */
        unsigned char headers_visible:1; /**< Are the headers visible? */
-       unsigned char scroll_visible:1; /**< Is the scrollpane visible? */
-       unsigned char scroll_headers:1; /**< Are the headers in the scrollpane? 
*/
        unsigned char dirty:1;    /**< Has the data changed? */
 };
 
@@ -163,6 +161,9 @@
 Ewl_Widget     *ewl_tree2_new(void);
 int             ewl_tree2_init(Ewl_Tree2 *tree);
 
+void            ewl_tree2_view_set(Ewl_Tree2 *t, Ewl_View *view);
+Ewl_View       *ewl_tree2_view_get(Ewl_Tree2 *t);
+
 void            ewl_tree2_data_set(Ewl_Tree2 *m, void *data);
 void           *ewl_tree2_data_get(Ewl_Tree2 *m);
 
@@ -191,13 +192,7 @@
 void            ewl_tree2_dirty_set(Ewl_Tree2 *tree2, unsigned int dirty);
 unsigned int    ewl_tree2_dirty_get(Ewl_Tree2 *tree2);
 
-void            ewl_tree2_scroll_visible_set(Ewl_Tree2 *tree, 
-                                               unsigned int visible);
-unsigned int    ewl_tree2_scroll_visible_get(Ewl_Tree2 *tree);
-
-void            ewl_tree2_scroll_headers_set(Ewl_Tree2 *tree,
-                                               unsigned int scroll);
-unsigned int    ewl_tree2_scroll_headers_get(Ewl_Tree2 *tree);
+Ewl_Widget     *ewl_tree2_view_widget_get(Ewl_Tree2 *tree);
 
 /*
  * Internal stuff.



-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to