Enlightenment CVS committal

Author  : moom16
Project : e17
Module  : proto

Dir     : e17/proto/etk/src/lib


Modified Files:
        etk_tree.c etk_tree.h etk_types.h 


Log Message:
* [Tree] Fix the row expanding and collapsing
* [Tree] Add cells with an icon and a text
* [Stock] Change the stock icons


===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_tree.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_tree.c  7 Oct 2005 21:33:43 -0000       1.2
+++ etk_tree.c  8 Oct 2005 14:43:36 -0000       1.3
@@ -261,14 +261,18 @@
  */
 void etk_tree_row_expand(Etk_Tree_Row *row)
 {
+   Etk_Tree_Node *n;
+   float offset;
+
    if (!row || row->node.expanded || !row->tree || (row->tree->mode != 
ETK_TREE_MODE_TREE))
       return;
 
+   offset = row->tree->scroll_percent * row->tree->item_height * 
row->tree->root.num_visible_children;
    row->node.expanded = TRUE;
-   /* TODO: fixme */
-   if (row->node.parent)
-      row->node.parent->num_visible_children -= row->node.num_visible_children;
-   printf("%p %d %d\n", row->node.parent, row->node.num_visible_children, 
row->tree->root.num_visible_children);
+   for (n = row->node.parent; n && n->expanded; n = n->parent)
+      n->num_visible_children += row->node.num_visible_children;
+   row->tree->scroll_percent = offset / (row->tree->item_height * 
row->tree->root.num_visible_children);
+   row->tree->scroll_percent = ETK_CLAMP(row->tree->scroll_percent, 0.0, 1.0);
 
    if (!row->tree->frozen)
       etk_widget_redraw_queue(ETK_WIDGET(row->tree));
@@ -280,14 +284,18 @@
  */
 void etk_tree_row_collapse(Etk_Tree_Row *row)
 {
+   Etk_Tree_Node *n;
+   float offset;
+
    if (!row || !row->node.expanded || !row->tree || (row->tree->mode != 
ETK_TREE_MODE_TREE))
       return;
 
+   offset = row->tree->scroll_percent * row->tree->item_height * 
row->tree->root.num_visible_children;
    row->node.expanded = FALSE;
-   /* TODO: fixme */
-   if (row->node.parent)
-      row->node.parent->num_visible_children += row->node.num_visible_children;
-   printf("%p %d %d\n", row->node.parent, row->node.num_visible_children, 
row->tree->root.num_visible_children);
+   for (n = row->node.parent; n && n->expanded; n = n->parent)
+      n->num_visible_children -= row->node.num_visible_children;
+   row->tree->scroll_percent = offset / (row->tree->item_height * 
row->tree->root.num_visible_children);
+   row->tree->scroll_percent = ETK_CLAMP(row->tree->scroll_percent, 0.0, 1.0);
 
    if (!row->tree->frozen)
       etk_widget_redraw_queue(ETK_WIDGET(row->tree));
@@ -701,7 +709,7 @@
    if (!tree || !node || !items_objects)
       return 0;
 
-   first_col_offset = xoffset + ((node->num_parent_children > 0) ? 
tree->expander_size + 4 : 8);
+   first_col_offset = xoffset + tree->expander_size + 4;
 
    i = 0;
    ecore_list_goto_first(node->child_rows);
@@ -751,6 +759,7 @@
          for (j = 0; j < tree->num_cols; j++)
          {
             Etk_Bool show_text = FALSE, show_image = FALSE;
+            int image_offset = 0;
    
             if (!tree->columns[j])
                continue;
@@ -783,6 +792,12 @@
                   
evas_object_image_file_set(item_objects->objects[j].image_object, 
row->cells[j].image_filename_value, NULL);
                   show_image = TRUE;
                   break;
+               case ETK_TREE_COL_ICON_TEXT:
+                  
evas_object_image_file_set(item_objects->objects[j].image_object, 
row->cells[j].icon_text_value.icon_filename, NULL);
+                  show_image = TRUE;
+                  
evas_object_text_text_set(item_objects->objects[j].text_object, 
row->cells[j].icon_text_value.text);
+                  show_text = TRUE;
+                  break;
                default:
                   break;
             }
@@ -797,6 +812,7 @@
                   iw = tree->image_height * ((float)iw / ih);
                   ih = tree->image_height;
                }
+               image_offset = iw + 8;
                evas_object_move(item_objects->objects[j].image_object,
                   x + ((j == 0) ? first_col_offset : tree->columns[j]->xoffset 
+ 8),
                   item_y + (tree->item_height - ih + 1) / 2);
@@ -813,7 +829,7 @@
    
                evas_object_geometry_get(item_objects->objects[j].text_object, 
NULL, NULL, NULL, &th);
                evas_object_move(item_objects->objects[j].text_object,
-                  x + ((j == 0) ? first_col_offset : tree->columns[j]->xoffset 
+ 8),
+                  x + image_offset + ((j == 0) ? first_col_offset : 
tree->columns[j]->xoffset + 8),
                   item_y + (tree->item_height - th + 1) / 2);
                evas_object_show(item_objects->objects[j].text_object);
             }
@@ -883,23 +899,23 @@
                new_cell->image_filename_value = NULL;
             break;
          }
-         case ETK_TREE_COL_TEXT_IMAGE:
+         case ETK_TREE_COL_ICON_TEXT:
          {
+            const char *icon;
             const char *text;
-            const char *image;
 
+            icon = va_arg(args, char *);
             text = va_arg(args, char *);
-            image = va_arg(args, char *);
 
-            if (text)
-               new_cell->text_image_value.text = strdup(text);
+            if (icon)
+               new_cell->icon_text_value.icon_filename = strdup(icon);
             else
-               new_cell->text_image_value.text = NULL;
+               new_cell->icon_text_value.icon_filename = NULL;
 
-            if (image)
-               new_cell->text_image_value.image_filename = strdup(image);
+            if (text)
+               new_cell->icon_text_value.text = strdup(text);
             else
-               new_cell->text_image_value.image_filename = NULL;
+               new_cell->icon_text_value.text = NULL;
 
             break;
          }
@@ -929,9 +945,8 @@
 
    for (n = new_row->node.parent; n; n = n->parent)
    {
-      if (n->expanded)
-         n->num_visible_children++;
-      else
+      n->num_visible_children++;
+      if (!n->expanded)
          break;
    }
 
@@ -997,7 +1012,7 @@
             evas_object_clip_set(new_item_objects->objects[i].image_object, 
tree->columns[i]->clip);
             etk_widget_member_object_add(ETK_WIDGET(tree), 
new_item_objects->objects[i].image_object);
             break;
-         case ETK_TREE_COL_TEXT_IMAGE:
+         case ETK_TREE_COL_ICON_TEXT:
             new_item_objects->objects[i].text_object = 
evas_object_text_add(evas);
             
evas_object_text_font_set(new_item_objects->objects[i].text_object, "Vera", 10);
             evas_object_color_set(new_item_objects->objects[i].text_object, 0, 
0, 0, 255);
@@ -1087,9 +1102,8 @@
 
    for (n = row->node.parent; n; n = n->parent)
    {
-      if (n->expanded)
-         n->num_visible_children--;
-      else
+      n->num_visible_children--;
+      if (!n->expanded)
          break;
    }
    if ((n = row->node.parent) && (n = n->parent))
@@ -1112,9 +1126,9 @@
       case ETK_TREE_COL_IMAGE:
          free(cell->image_filename_value);
          break;
-      case ETK_TREE_COL_TEXT_IMAGE:
-         free(cell->text_image_value.text);
-         free(cell->text_image_value.image_filename);
+      case ETK_TREE_COL_ICON_TEXT:
+         free(cell->icon_text_value.icon_filename);
+         free(cell->icon_text_value.text);
          break;
       default:
          break;
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_tree.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_tree.h  7 Oct 2005 21:33:43 -0000       1.2
+++ etk_tree.h  8 Oct 2005 14:43:36 -0000       1.3
@@ -112,9 +112,9 @@
    char *image_filename_value;
    struct
    {
+      char *icon_filename;
       char *text;
-      char *image_filename;
-   } text_image_value;
+   } icon_text_value;
    int int_value;
    double double_value;
 };
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_types.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_types.h 7 Oct 2005 21:33:43 -0000       1.2
+++ etk_types.h 8 Oct 2005 14:43:36 -0000       1.3
@@ -153,7 +153,7 @@
 {
    ETK_TREE_COL_TEXT,
    ETK_TREE_COL_IMAGE,
-   ETK_TREE_COL_TEXT_IMAGE,
+   ETK_TREE_COL_ICON_TEXT,
    ETK_TREE_COL_INT,
    ETK_TREE_COL_DOUBLE
 } Etk_Tree_Col_Type;




-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to