Enlightenment

Log:
  Fix misuse of win_resize_object on test_flip3 and add comments
  explaining better the sorted insertion of index widget.
  Thanks to Sachiel for spotting that stuff.
  
Author:       bdilly
Date:         2010-05-25 06:36:20 -0700 (Tue, 25 May 2010)
New Revision: 49195

Modified:
  trunk/TMP/st/elementary/src/bin/test_flip.c trunk/TMP/st/elementary/src/lib/elm_index.c 

Modified: trunk/TMP/st/elementary/src/bin/test_flip.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_flip.c	2010-05-25 13:17:00 UTC (rev 49194)
+++ trunk/TMP/st/elementary/src/bin/test_flip.c	2010-05-25 13:36:20 UTC (rev 49195)
@@ -301,7 +301,6 @@
    bx3 = elm_box_add(win);
    evas_object_size_hint_align_set(bx3, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bx3, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_win_resize_object_add(win, bx3);
    evas_object_show(bx3);
 
    fl_f = elm_flip_add(win);
@@ -311,7 +310,6 @@
    bx5 = elm_box_add(win);
    evas_object_size_hint_align_set(bx5, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bx5, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_win_resize_object_add(win, bx5);
    evas_object_show(bx5);
 
    o = elm_bg_add(win);
@@ -334,7 +332,6 @@
    bx5 = elm_box_add(win);
    evas_object_size_hint_align_set(bx5, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bx5, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_win_resize_object_add(win, bx5);
    evas_object_show(bx5);
 
    o = elm_bg_add(win);
@@ -366,7 +363,6 @@
 
    bx4 = elm_box_add(win);
    evas_object_size_hint_weight_set(bx4, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_win_resize_object_add(win, bx4);
    evas_object_show(bx4);
 
    fl_b = elm_flip_add(win);
@@ -376,7 +372,6 @@
    bx5 = elm_box_add(win);
    evas_object_size_hint_align_set(bx5, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bx5, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_win_resize_object_add(win, bx5);
    evas_object_show(bx5);
 
    o = elm_bg_add(win);
@@ -399,7 +394,6 @@
    bx5 = elm_box_add(win);
    evas_object_size_hint_align_set(bx5, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bx5, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_win_resize_object_add(win, bx5);
    evas_object_show(bx5);
 
    o = elm_bg_add(win);

Modified: trunk/TMP/st/elementary/src/lib/elm_index.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_index.c	2010-05-25 13:17:00 UTC (rev 49194)
+++ trunk/TMP/st/elementary/src/lib/elm_index.c	2010-05-25 13:36:20 UTC (rev 49195)
@@ -744,7 +744,10 @@
  * be used when cmp_func return 0. It means the index item already exists.
  * So, to decide which data item should be pointed by the index item, a function
  * to compare them is needed. If this function is not provided, index items
- * will be duplicated.
+ * will be duplicated. If cmp_data_func returns a non-negative value, the
+ * previous index item data will be replaced by the inserted @p item. So
+ * if the previous data need to be free, it should be done in this function,
+ * because the reference will be lost.
  *
  * @ingroup Index
  */

Log:
  Implements a way to select if we should use ecore_evas for cursor or only engine
  
  With this commit is now possible to not use theme's cursor (default behevior)
  that could be overriding cursors defined by the engine.
  
  
Author:       bdilly
Date:         2010-09-25 15:03:37 -0700 (Sat, 25 Sep 2010)
New Revision: 52761

Modified:
  trunk/TMP/st/elementary/src/bin/test_cursor.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_gengrid.c trunk/TMP/st/elementary/src/lib/elm_genlist.c trunk/TMP/st/elementary/src/lib/elm_list.c trunk/TMP/st/elementary/src/lib/elm_toolbar.c trunk/TMP/st/elementary/src/lib/elm_widget.c trunk/TMP/st/elementary/src/lib/elm_widget.h trunk/TMP/st/elementary/src/lib/els_cursor.c 

Modified: trunk/TMP/st/elementary/src/bin/test_cursor.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_cursor.c	2010-09-25 22:01:19 UTC (rev 52760)
+++ trunk/TMP/st/elementary/src/bin/test_cursor.c	2010-09-25 22:03:37 UTC (rev 52761)
@@ -145,18 +145,27 @@
 
    o = elm_button_add(win);
    elm_object_cursor_set(o, ELM_CURSOR_HAND2);
+   elm_button_label_set(o, "hand2 x");
+   elm_box_pack_end(bx, o);
+   evas_object_show(o);
+
+   o = elm_button_add(win);
+   elm_object_cursor_set(o, ELM_CURSOR_HAND2);
+   elm_object_cursor_engine_only_set(o, EINA_FALSE);
    elm_button_label_set(o, "hand2");
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
    o = elm_button_add(win);
    elm_object_cursor_set(o, "hand3");
+   elm_object_cursor_engine_only_set(o, EINA_FALSE);
    elm_button_label_set(o, "hand3");
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
    o = elm_button_add(win);
    elm_object_cursor_set(o, "hand3");
+   elm_object_cursor_engine_only_set(o, EINA_FALSE);
    elm_object_cursor_style_set(o, "transparent");
    elm_button_label_set(o, "hand3 transparent");
    elm_box_pack_end(bx, o);
@@ -164,6 +173,7 @@
 
    o = elm_button_add(win);
    elm_object_cursor_set(o, "hand3");
+   elm_object_cursor_engine_only_set(o, EINA_FALSE);
    elm_object_cursor_unset(o);
    elm_button_label_set(o, "unset");
    elm_box_pack_end(bx, o);
@@ -171,6 +181,7 @@
 
    o = elm_button_add(win);
    elm_object_cursor_set(o, "hand4");
+   elm_object_cursor_engine_only_set(o, EINA_FALSE);
    elm_button_label_set(o, "not existent");
    elm_box_pack_end(bx, o);
    evas_object_show(o);
@@ -179,14 +190,19 @@
    elm_box_pack_end(bx, o);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_fill_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   lit = elm_list_item_append(o, "cursor hand2 x", NULL, NULL,  NULL, NULL);
+   elm_list_item_cursor_set(lit, ELM_CURSOR_HAND2);
    lit = elm_list_item_append(o, "cursor hand2", NULL, NULL,  NULL, NULL);
    elm_list_item_cursor_set(lit, ELM_CURSOR_HAND2);
+   elm_list_item_cursor_engine_only_set(lit, EINA_FALSE);
    lit = elm_list_item_append(o, "cursor hand3", NULL, NULL,  NULL, NULL);
    elm_list_item_cursor_set(lit, "hand3");
+   elm_list_item_cursor_engine_only_set(lit, EINA_FALSE);
    lit = elm_list_item_append(o, "cursor hand3 transparent", NULL, NULL,
                               NULL, NULL);
    elm_list_item_cursor_set(lit, "hand3");
    elm_list_item_cursor_style_set(lit, "transparent");
+   elm_list_item_cursor_engine_only_set(lit, EINA_FALSE);
    elm_list_go(o);
    evas_object_show(o);
 

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-09-25 22:01:19 UTC (rev 52760)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-09-25 22:03:37 UTC (rev 52761)
@@ -674,6 +674,8 @@
    EAPI void         elm_gengrid_item_cursor_unset(Elm_Gengrid_Item *item);
    EAPI void         elm_gengrid_item_cursor_style_set(Elm_Gengrid_Item *item, const char *style);
    EAPI const char  *elm_gengrid_item_cursor_style_get(const Elm_Gengrid_Item *item);
+   EAPI void         elm_gengrid_item_cursor_engine_only_set(Elm_Gengrid_Item *item, Eina_Bool engine_only);
+   EAPI Eina_Bool    elm_gengrid_item_cursor_engine_only_get(const Elm_Gengrid_Item *item);
 
    EAPI void	     elm_gengrid_clear(Evas_Object *obj);
    EAPI void	    *elm_gengrid_item_data_get(const Elm_Gengrid_Item *item);
@@ -1026,6 +1028,8 @@
    EAPI void              elm_toolbar_item_cursor_unset(Elm_Toolbar_Item *item);
    EAPI void              elm_toolbar_item_cursor_style_set(Elm_Toolbar_Item *item, const char *style);
    EAPI const char       *elm_toolbar_item_cursor_style_get(const Elm_Toolbar_Item *item);
+   EAPI void              elm_toolbar_item_cursor_engine_only_set(Elm_Toolbar_Item *item, Eina_Bool engine_only);
+   EAPI Eina_Bool         elm_toolbar_item_cursor_engine_only_get(const Elm_Toolbar_Item *item);
 
    EAPI Eina_List        *elm_toolbar_item_get_all(Evas_Object *obj);
    EAPI Elm_Toolbar_Item *elm_toolbar_item_get_first(Evas_Object *obj);
@@ -1069,6 +1073,8 @@
    EAPI void         elm_object_cursor_unset(Evas_Object *obj);
    EAPI void         elm_object_cursor_style_set(Evas_Object *obj, const char *style);
    EAPI const char  *elm_object_cursor_style_get(const Evas_Object *obj);
+   EAPI void         elm_object_cursor_engine_only_set(Evas_Object *obj, Eina_Bool engine_only);
+   EAPI Eina_Bool    elm_object_cursor_engine_only_get(const Evas_Object *obj);
 
    typedef struct _Elm_Menu_Item Elm_Menu_Item; /**< Item of Elm_Menu. Sub-type of Elm_Widget_Item */
    EAPI Evas_Object     *elm_menu_add(Evas_Object *parent);
@@ -1147,6 +1153,8 @@
    EAPI void             elm_list_item_cursor_unset(Elm_List_Item *item);
    EAPI void             elm_list_item_cursor_style_set(Elm_List_Item *item, const char *style);
    EAPI const char      *elm_list_item_cursor_style_get(const Elm_List_Item *item);
+   EAPI void             elm_list_item_cursor_engine_only_set(Elm_List_Item *item, Eina_Bool engine_only);
+   EAPI Eina_Bool        elm_list_item_cursor_engine_only_get(const Elm_List_Item *item);
 
    EAPI void             elm_list_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
    EAPI void             elm_list_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v);
@@ -1293,6 +1301,8 @@
    EAPI void              elm_genlist_item_cursor_unset(Elm_Genlist_Item *item);
    EAPI void              elm_genlist_item_cursor_style_set(Elm_Genlist_Item *item, const char *style);
    EAPI const char       *elm_genlist_item_cursor_style_get(const Elm_Genlist_Item *item);
+   EAPI void              elm_genlist_item_cursor_engine_only_set(Elm_Genlist_Item *item, Eina_Bool engine_only);
+   EAPI Eina_Bool         elm_genlist_item_cursor_engine_only_get(const Elm_Genlist_Item *item);
 
 
    EAPI Evas_Object *elm_check_add(Evas_Object *parent);

Modified: trunk/TMP/st/elementary/src/lib/elm_gengrid.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_gengrid.c	2010-09-25 22:01:19 UTC (rev 52760)
+++ trunk/TMP/st/elementary/src/lib/elm_gengrid.c	2010-09-25 22:03:37 UTC (rev 52761)
@@ -1638,6 +1638,42 @@
 }
 
 /**
+ * Set if the cursor set should be searched on the theme or should use
+ * the provided by the engine, only.
+ *
+ * @note before you set if should look on theme you should define a cursor
+ * with elm_object_cursor_set(). By default it will only look for cursors
+ * provided by the engine.
+ *
+ * @param item widget item with cursor already set.
+ * @param engine_only boolean to define it cursors should be looked only
+ * between the provided by the engine or searched on widget's theme as well.
+ *
+ * @ingroup Gengrid
+ */
+EAPI void
+elm_gengrid_item_cursor_engine_only_set(Elm_Gengrid_Item *item, Eina_Bool engine_only)
+{
+   elm_widget_item_cursor_engine_only_set(item, engine_only);
+}
+
+/**
+ * Get the cursor engine only usage for this item cursor.
+ *
+ * @param item widget item with cursor already set.
+ * @return engine_only boolean to define it cursors should be looked only
+ * between the provided by the engine or searched on widget's theme as well. If
+ *         the object does not have a cursor set, then EINA_FALSE is returned.
+ *
+ * @ingroup Gengrid
+ */
+EAPI Eina_Bool
+elm_gengrid_item_cursor_engine_only_get(const Elm_Gengrid_Item *item)
+{
+   return elm_widget_item_cursor_engine_only_get(item);
+}
+
+/**
  * Set the always select mode.
  *
  * Cells will only call their selection func and callback when first becoming

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-09-25 22:01:19 UTC (rev 52760)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-09-25 22:03:37 UTC (rev 52761)
@@ -3055,6 +3055,42 @@
 }
 
 /**
+ * Set if the cursor set should be searched on the theme or should use
+ * the provided by the engine, only.
+ *
+ * @note before you set if should look on theme you should define a cursor
+ * with elm_object_cursor_set(). By default it will only look for cursors
+ * provided by the engine.
+ *
+ * @param item widget item with cursor already set.
+ * @param engine_only boolean to define it cursors should be looked only
+ * between the provided by the engine or searched on widget's theme as well.
+ *
+ * @ingroup Genlist
+ */
+EAPI void
+elm_genlist_item_cursor_engine_only_set(Elm_Genlist_Item *item, Eina_Bool engine_only)
+{
+   elm_widget_item_cursor_engine_only_set(item, engine_only);
+}
+
+/**
+ * Get the cursor engine only usage for this item cursor.
+ *
+ * @param item widget item with cursor already set.
+ * @return engine_only boolean to define it cursors should be looked only
+ * between the provided by the engine or searched on widget's theme as well. If
+ *         the object does not have a cursor set, then EINA_FALSE is returned.
+ *
+ * @ingroup Genlist
+ */
+EAPI Eina_Bool
+elm_genlist_item_cursor_engine_only_get(const Elm_Genlist_Item *item)
+{
+   return elm_widget_item_cursor_engine_only_get(item);
+}
+
+/**
  * This sets the horizontal stretching mode
  *
  * This sets the mode used for sizing items horizontally. Valid modes are

Modified: trunk/TMP/st/elementary/src/lib/elm_list.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_list.c	2010-09-25 22:01:19 UTC (rev 52760)
+++ trunk/TMP/st/elementary/src/lib/elm_list.c	2010-09-25 22:03:37 UTC (rev 52761)
@@ -1669,6 +1669,42 @@
 }
 
 /**
+ * Set if the cursor set should be searched on the theme or should use
+ * the provided by the engine, only.
+ *
+ * @note before you set if should look on theme you should define a cursor
+ * with elm_object_cursor_set(). By default it will only look for cursors
+ * provided by the engine.
+ *
+ * @param item widget item with cursor already set.
+ * @param engine_only boolean to define it cursors should be looked only
+ * between the provided by the engine or searched on widget's theme as well.
+ *
+ * @ingroup List
+ */
+EAPI void
+elm_list_item_cursor_engine_only_set(Elm_List_Item *item, Eina_Bool engine_only)
+{
+   elm_widget_item_cursor_engine_only_set(item, engine_only);
+}
+
+/**
+ * Get the cursor engine only usage for this item cursor.
+ *
+ * @param item widget item with cursor already set.
+ * @return engine_only boolean to define it cursors should be looked only
+ * between the provided by the engine or searched on widget's theme as well. If
+ *         the object does not have a cursor set, then EINA_FALSE is returned.
+ *
+ * @ingroup List
+ */
+EAPI Eina_Bool
+elm_list_item_cursor_engine_only_get(const Elm_List_Item *item)
+{
+   return elm_widget_item_cursor_engine_only_get(item);
+}
+
+/**
  * Set bounce mode
  *
  * This will enable or disable the scroller bounce mode for the list. See

Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_toolbar.c	2010-09-25 22:01:19 UTC (rev 52760)
+++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c	2010-09-25 22:03:37 UTC (rev 52761)
@@ -1011,6 +1011,42 @@
 }
 
 /**
+ * Set if the cursor set should be searched on the theme or should use
+ * the provided by the engine, only.
+ *
+ * @note before you set if should look on theme you should define a cursor
+ * with elm_object_cursor_set(). By default it will only look for cursors
+ * provided by the engine.
+ *
+ * @param item widget item with cursor already set.
+ * @param engine_only boolean to define it cursors should be looked only
+ * between the provided by the engine or searched on widget's theme as well.
+ *
+ * @ingroup Toolbar
+ */
+EAPI void
+elm_toolbar_item_cursor_engine_only_set(Elm_Toolbar_Item *item, Eina_Bool engine_only)
+{
+   elm_widget_item_cursor_engine_only_set(item, engine_only);
+}
+
+/**
+ * Get the cursor engine only usage for this item cursor.
+ *
+ * @param item widget item with cursor already set.
+ * @return engine_only boolean to define it cursors should be looked only
+ * between the provided by the engine or searched on widget's theme as well. If
+ *         the object does not have a cursor set, then EINA_FALSE is returned.
+ *
+ * @ingroup Toolbar
+ */
+EAPI Eina_Bool
+elm_toolbar_item_cursor_engine_only_get(const Elm_Toolbar_Item *item)
+{
+   return elm_widget_item_cursor_engine_only_get(item);
+}
+
+/**
  * Get whether the toolbar item opens a menu.
  *
  * @param item The toolbar item

Modified: trunk/TMP/st/elementary/src/lib/elm_widget.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_widget.c	2010-09-25 22:01:19 UTC (rev 52760)
+++ trunk/TMP/st/elementary/src/lib/elm_widget.c	2010-09-25 22:03:37 UTC (rev 52761)
@@ -1814,6 +1814,44 @@
    return elm_object_cursor_style_get(item->view);
 }
 
+/**
+ * Set if the cursor set should be searched on the theme or should use
+ * the provided by the engine, only.
+ *
+ * @note before you set if should look on theme you should define a cursor
+ * with elm_object_cursor_set(). By default it will only look for cursors
+ * provided by the engine.
+ *
+ * @param item widget item with cursor already set.
+ * @param engine_only boolean to define it cursors should be looked only
+ * between the provided by the engine or searched on widget's theme as well.
+ *
+ * @internal
+ */
+EAPI void
+_elm_widget_item_cursor_engine_only_set(Elm_Widget_Item *item, Eina_Bool engine_only)
+{
+   ELM_WIDGET_ITEM_CHECK_OR_RETURN(item);
+   elm_object_cursor_engine_only_set(item->view, engine_only);
+}
+
+/**
+ * Get the cursor engine only usage for this item cursor.
+ *
+ * @param item widget item with cursor already set.
+ * @return engine_only boolean to define it cursors should be looked only
+ * between the provided by the engine or searched on widget's theme as well. If
+ *         the object does not have a cursor set, then EINA_FALSE is returned.
+ *
+ * @internal
+ */
+EAPI Eina_Bool
+_elm_widget_item_cursor_engine_only_get(const Elm_Widget_Item *item)
+{
+   ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, EINA_FALSE);
+   return elm_object_cursor_engine_only_get(item->view);
+}
+
 // smart object funcs
 static void
 _smart_reconfigure(Smart_Data *sd)

Modified: trunk/TMP/st/elementary/src/lib/elm_widget.h
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_widget.h	2010-09-25 22:01:19 UTC (rev 52760)
+++ trunk/TMP/st/elementary/src/lib/elm_widget.h	2010-09-25 22:03:37 UTC (rev 52761)
@@ -309,6 +309,8 @@
 EAPI void             _elm_widget_item_cursor_unset(Elm_Widget_Item *item);
 EAPI void             _elm_widget_item_cursor_style_set(Elm_Widget_Item *item, const char *style);
 EAPI const char      *_elm_widget_item_cursor_style_get(const Elm_Widget_Item *item);
+EAPI void             _elm_widget_item_cursor_engine_only_set(Elm_Widget_Item *item, Eina_Bool engine_only);
+EAPI Eina_Bool        _elm_widget_item_cursor_engine_only_get(const Elm_Widget_Item *item);
 
 /**
  * Convenience macro to create new widget item, doing casts for you.
@@ -406,6 +408,18 @@
  */
 #define elm_widget_item_cursor_style_get(item) \
   _elm_widget_item_cursor_style_get((const Elm_Widget_Item *)item)
+/**
+ * Convenience function to change item's cursor engine_only.
+ * @see _elm_widget_item_cursor_engine_only_set()
+ */
+#define elm_widget_item_cursor_engine_only_set(item, engine_only) \
+  _elm_widget_item_cursor_engine_only_set((Elm_Widget_Item *)item, engine_only)
+/**
+ * Convenience function to query item's cursor engine_only.
+ * @see _elm_widget_item_cursor_engine_only_get()
+ */
+#define elm_widget_item_cursor_engine_only_get(item) \
+  _elm_widget_item_cursor_engine_only_get((const Elm_Widget_Item *)item)
 
 /**
  * Cast and ensure the given pointer is an Elm_Widget_Item or return NULL.

Modified: trunk/TMP/st/elementary/src/lib/els_cursor.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_cursor.c	2010-09-25 22:01:19 UTC (rev 52760)
+++ trunk/TMP/st/elementary/src/lib/els_cursor.c	2010-09-25 22:03:37 UTC (rev 52761)
@@ -148,6 +148,7 @@
 #endif
    Eina_Bool visible:1;
    Eina_Bool use_engine:1;
+   Eina_Bool engine_only:1;
 };
 
 static void
@@ -200,17 +201,17 @@
 }
 
 static void
-_elm_cursor_mouse_in(void *data, Evas *evas, Evas_Object *obj, void *event_info __UNUSED__)
+_elm_cursor_mouse_in(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Elm_Cursor *cur = data;
 
    if (cur->visible) return;
    evas_event_freeze(cur->evas);
    cur->visible = EINA_TRUE;
-   if (!cur->use_engine)
+   if ((!cur->engine_only) && (!cur->use_engine))
      {
         if (!cur->obj)
-           _elm_cursor_obj_add(obj, cur);
+           _elm_cursor_obj_add(cur->eventarea, cur);
         ecore_evas_object_cursor_set(cur->ee, cur->obj,
                                      ELM_OBJECT_LAYER_CURSOR, cur->hot_x,
                                      cur->hot_y);
@@ -232,7 +233,7 @@
    if (!cur->visible) return;
    evas_event_freeze(cur->evas);
    cur->visible = EINA_FALSE;
-   if (!cur->use_engine)
+   if ((!cur->engine_only) || (!cur->use_engine))
      {
         ecore_evas_object_cursor_set(cur->ee, NULL, ELM_OBJECT_LAYER_CURSOR,
                                      cur->hot_x, cur->hot_y);
@@ -302,6 +303,7 @@
 
    cur->owner = owner;
    cur->eventarea = eventarea;
+   cur->engine_only = EINA_TRUE;
    cur->visible = EINA_FALSE;
 
    cur->cursor_name = eina_stringshare_add(cursor);
@@ -432,6 +434,8 @@
  *
  * @param obj an object with cursor already set.
  * @param style the theme style to use (default, transparent, ...)
+ *
+ * @ingroup Cursors
  */
 EAPI void
 elm_object_cursor_style_set(Evas_Object *obj, const char *style)
@@ -466,6 +470,8 @@
  * @param obj an object with cursor already set.
  * @return style the theme style in use, defaults to "default". If the
  *         object does not have a cursor set, then NULL is returned.
+ *
+ * @ingroup Cursors
  */
 EAPI const char *
 elm_object_cursor_style_get(const Evas_Object *obj)
@@ -488,3 +494,41 @@
    else
       _elm_cursor_set_hot_spots(cur);
 }
+
+/**
+ * Set if the cursor set should be searched on the theme or should use
+ * the provided by the engine, only.
+ *
+ * @note before you set if should look on theme you should define a cursor
+ * with elm_object_cursor_set(). By default it will only look for cursors
+ * provided by the engine.
+ *
+ * @param obj an object with cursor already set.
+ * @param engine_only boolean to define it cursors should be looked only
+ * between the provided by the engine or searched on widget's theme as well.
+ *
+ * @ingroup Cursors
+ */
+EAPI void
+elm_object_cursor_engine_only_set(Evas_Object *obj, Eina_Bool engine_only)
+{
+   ELM_CURSOR_GET_OR_RETURN(cur, obj);
+   cur->engine_only = engine_only;
+}
+
+/**
+ * Get the cursor engine only usage for this object cursor.
+ *
+ * @param obj an object with cursor already set.
+ * @return engine_only boolean to define it cursors should be looked only
+ * between the provided by the engine or searched on widget's theme as well. If
+ *         the object does not have a cursor set, then EINA_FALSE is returned.
+ *
+ * @ingroup Cursors
+ */
+EAPI Eina_Bool
+elm_object_cursor_engine_only_get(const Evas_Object *obj)
+{
+   ELM_CURSOR_GET_OR_RETURN(cur, obj, EINA_FALSE);
+   return cur->engine_only;
+}

Log:
  Remove some dead assignments from elementary
  
Author:       bdilly
Date:         2010-09-25 15:07:55 -0700 (Sat, 25 Sep 2010)
New Revision: 52763

Modified:
  trunk/TMP/st/elementary/src/bin/config.c trunk/TMP/st/elementary/src/bin/quicklaunch.c trunk/TMP/st/elementary/src/bin/test_launcher.c trunk/TMP/st/elementary/src/bin/test_map.c trunk/TMP/st/elementary/src/lib/elm_cnp_helper.c trunk/TMP/st/elementary/src/lib/elm_entry.c trunk/TMP/st/elementary/src/lib/elm_genlist.c trunk/TMP/st/elementary/src/lib/elm_index.c trunk/TMP/st/elementary/src/lib/elm_label.c trunk/TMP/st/elementary/src/lib/elm_list.c trunk/TMP/st/elementary/src/lib/elm_photocam.c trunk/TMP/st/elementary/src/lib/elm_widget.c trunk/TMP/st/elementary/src/lib/elm_win.c trunk/TMP/st/elementary/src/lib/els_box.c trunk/TMP/st/elementary/src/lib/els_scroller.c 

Modified: trunk/TMP/st/elementary/src/bin/config.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/config.c	2010-09-25 22:04:51 UTC (rev 52762)
+++ trunk/TMP/st/elementary/src/bin/config.c	2010-09-25 22:07:55 UTC (rev 52763)
@@ -185,7 +185,6 @@
    front_vis  = elm_flip_front_get(fl);
    if (front_vis)
      {
-        front = elm_flip_content_front_get(fl);
         back  = elm_flip_content_back_get(fl);
         elm_table_pack(holder, back, 0, 0, 1, 1);
         evas_object_hide(back);
@@ -195,7 +194,6 @@
    else
      {
         front = elm_flip_content_front_get(fl);
-        back  = elm_flip_content_back_get(fl);
         elm_table_pack(holder, front, 0, 0, 1, 1);
         evas_object_hide(front);
 //        elm_table_unpack(holder, wid); // this should NOT be needed - but in evas_table/elm_table

Modified: trunk/TMP/st/elementary/src/bin/quicklaunch.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/quicklaunch.c	2010-09-25 22:04:51 UTC (rev 52762)
+++ trunk/TMP/st/elementary/src/bin/quicklaunch.c	2010-09-25 22:07:55 UTC (rev 52763)
@@ -64,9 +64,7 @@
 child_handler(int x, siginfo_t *info, void *data)
 {
    int status;
-   pid_t pid;
-
-   while ((pid = waitpid(-1, &status, WNOHANG)) > 0);
+   while (waitpid(-1, &status, WNOHANG) > 0);
 }
 
 static void
@@ -88,13 +86,13 @@
 handle_run(int fd, unsigned long bytes)
 {
    unsigned char *buf = NULL;
-   int i, num;
+   int i;
    char **argv = NULL;
    char *cwd;
    int argc;
 
    buf = alloca(bytes);
-   if ((num = read(fd, buf, bytes)) < 0)
+   if (read(fd, buf, bytes) < 0)
      {
 	close(fd);
 	return;

Modified: trunk/TMP/st/elementary/src/bin/test_launcher.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_launcher.c	2010-09-25 22:04:51 UTC (rev 52762)
+++ trunk/TMP/st/elementary/src/bin/test_launcher.c	2010-09-25 22:07:55 UTC (rev 52763)
@@ -68,7 +68,6 @@
    evas_object_data_del(data, "timer");
    tb = evas_object_data_get(data, "tb");
    sc = evas_object_data_get(data, "sc");
-   mb = evas_object_data_get(data, "mb");
    elm_object_scroll_freeze_push(sc);
    evas_object_data_set(data, "dragging", (void *)(long)(1));
    evas_object_color_set(data, 255, 255, 255, 255);
@@ -142,7 +141,6 @@
         evas_object_data_del(obj, "dragging");
         tb = evas_object_data_get(obj, "tb");
         sc = evas_object_data_get(obj, "sc");
-        mb = evas_object_data_get(data, "mb");
         elm_object_scroll_freeze_pop(sc);
         tbx = (int)(long)evas_object_data_get(obj, "tbx");
         tby = (int)(long)evas_object_data_get(obj, "tby");
@@ -569,7 +567,6 @@
    ly = evas_object_data_get(data, "ly");
    ly2 = evas_object_data_get(data, "ly2");
    sc = evas_object_data_get(data, "sc");
-   mb = evas_object_data_get(data, "mb");
    elm_object_scroll_freeze_push(sc);
    evas_object_data_set(data, "dragging", (void *)(long)1);
    evas_object_color_set(data, 255, 255, 255, 255);
@@ -652,7 +649,6 @@
         evas_object_data_del(obj, "dragging");
         ly = evas_object_data_get(obj, "ly");
         sc = evas_object_data_get(obj, "sc");
-        mb = evas_object_data_get(data, "mb");
         elm_object_scroll_freeze_pop(sc);
         slx = (int)(long)evas_object_data_get(obj, "slx");
         sly = (int)(long)evas_object_data_get(obj, "sly");

Modified: trunk/TMP/st/elementary/src/bin/test_map.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_map.c	2010-09-25 22:04:51 UTC (rev 52762)
+++ trunk/TMP/st/elementary/src/bin/test_map.c	2010-09-25 22:07:55 UTC (rev 52763)
@@ -256,7 +256,6 @@
         else
         {
             m_clas = itc_parking;
-            g_clas = itc_group_parking;
             d = &data_parking;
         }
 

Modified: trunk/TMP/st/elementary/src/lib/elm_cnp_helper.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_cnp_helper.c	2010-09-25 22:04:51 UTC (rev 52762)
+++ trunk/TMP/st/elementary/src/lib/elm_cnp_helper.c	2010-09-25 22:07:55 UTC (rev 52763)
@@ -654,13 +654,10 @@
    Ecore_X_Atom *atomlist;
    Evas_Object *top;
    int i,j;
-   int prio, selected;
 
    targets = notify->data;
    atomlist = (Ecore_X_Atom *)(targets->data.data);
 
-   prio = -1;
-   selected = -1;
    /* Start from 1: Skip targets */
    for (j = 1 ; j < CNP_N_ATOMS ; j ++)
      {

Modified: trunk/TMP/st/elementary/src/lib/elm_entry.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_entry.c	2010-09-25 22:04:51 UTC (rev 52762)
+++ trunk/TMP/st/elementary/src/lib/elm_entry.c	2010-09-25 22:07:55 UTC (rev 52763)
@@ -299,7 +299,6 @@
    wd->deferred_recalc_job = NULL;
    evas_object_geometry_get(wd->ent, NULL, NULL, &resw, &resh);
    resh = 0;
-   minminw = 0;
    edje_object_size_min_restricted_calc(wd->ent, &minw, &minh, 0, 0);
    elm_coords_finger_size_adjust(1, &minw, 1, &minh);
    minminw = minw;

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-09-25 22:04:51 UTC (rev 52762)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-09-25 22:07:55 UTC (rev 52763)
@@ -1218,7 +1218,6 @@
                                                     wd->show_item->block->w,
                                                     wd->show_item->h);
 	     wd->show_item = NULL;
-	     showme = 0;
 	  }
      }
    if (minw_change)

Modified: trunk/TMP/st/elementary/src/lib/elm_index.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_index.c	2010-09-25 22:04:51 UTC (rev 52762)
+++ trunk/TMP/st/elementary/src/lib/elm_index.c	2010-09-25 22:07:55 UTC (rev 52763)
@@ -291,7 +291,6 @@
    Evas_Coord x, y, w, h, bx, by, bw, bh, xx, yy;
    double cdv = 0.5;
    Evas_Coord dist;
-   Eina_Bool change = EINA_FALSE;
    char *label = NULL, *last = NULL;
    int i;
    if (!wd) return;
@@ -340,7 +339,6 @@
         if (it_closest) it_closest->selected = 1;
         if (it_closest != it_last)
           {
-             change = 1;
              if (it_last)
                {
                   const char *stacking, *selectraise;

Modified: trunk/TMP/st/elementary/src/lib/elm_label.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_label.c	2010-09-25 22:04:51 UTC (rev 52762)
+++ trunk/TMP/st/elementary/src/lib/elm_label.c	2010-09-25 22:07:55 UTC (rev 52763)
@@ -44,7 +44,6 @@
    wd->deferred_recalc_job = NULL;
    evas_object_geometry_get(wd->lbl, NULL, NULL, &resw, &resh);
    resh = 0;
-   minminw = 0;
    edje_object_size_min_restricted_calc(wd->lbl, &minw, &minh, 0, 0);
    minminw = minw;
    if (wd->wrap_w >= resw) 
@@ -140,10 +139,7 @@
         starttag = curlocater;
         endtag = curlocater + strlen(key);
         if ((!endtag) || (*endtag != '='))
-          {
-             foundflag = 0;
-             return -1;
-          }
+           return -1;
         
         firstindex = abs(oldstring - curlocater);
         firstindex += strlen(key) + 1; // strlen("key") + strlen("=")
@@ -581,14 +577,13 @@
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
-   char *label, fontvalue[16];
+   char fontvalue[16];
    int len;
    
    if (!wd) return;
    _elm_dangerous_call_check(__FUNCTION__);
    len = strlen(wd->label);
    if (len <= 0) return;
-   label = alloca(sizeof(char) * (len + 32));
    sprintf(fontvalue, "%i", fontsize);
    
    if (_stringshare_key_value_replace(&wd->label, "font_size", fontvalue, 0) == 0)
@@ -653,14 +648,13 @@
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
-   char *label, colorstring[16];
+   char colorstring[16];
    int len;
 
    if (!wd) return;
    _elm_dangerous_call_check(__FUNCTION__);
    len = strlen(wd->label);
    if (len <= 0) return;
-   label = alloca(sizeof(char) * (len + 32));
    sprintf(colorstring, "#%02x%02x%02x%02x", r, g, b, a);
 
    if (_stringshare_key_value_replace(&wd->label, "color", colorstring, 0) == 0)

Modified: trunk/TMP/st/elementary/src/lib/elm_list.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_list.c	2010-09-25 22:04:51 UTC (rev 52762)
+++ trunk/TMP/st/elementary/src/lib/elm_list.c	2010-09-25 22:07:55 UTC (rev 52763)
@@ -658,7 +658,6 @@
 		  selectraise = edje_object_data_get(it->base.view, "selectraise");
 		  if ((selectraise) && (!strcmp(selectraise, "on")))
 		    evas_object_raise(it->base.view);
-		  stacking = edje_object_data_get(it->base.view, "stacking");
 	       }
 	     it->fixed = EINA_TRUE;
 	     it->is_even = it->even;

Modified: trunk/TMP/st/elementary/src/lib/elm_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_photocam.c	2010-09-25 22:04:51 UTC (rev 52762)
+++ trunk/TMP/st/elementary/src/lib/elm_photocam.c	2010-09-25 22:07:55 UTC (rev 52763)
@@ -360,16 +360,12 @@
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    int x, y;
-   Evas_Coord ox, oy, ow, oh, cvx, cvy, cvw, cvh, gw, gh, ax, ay, tx, ty;
+   Evas_Coord ox, oy, ow, oh, cvx, cvy, cvw, cvh, gw, gh, tx, ty;
    if (!wd) return;
    evas_object_geometry_get(wd->pan_smart, &ox, &oy, &ow, &oh);
    evas_output_viewport_get(evas_object_evas_get(wd->obj), &cvx, &cvy, &cvw, &cvh);
-   ax = 0;
-   ay = 0;
    gw = wd->size.w;
    gh = wd->size.h;
-   if (ow > gw) ax = (ow - gw) / 2;
-   if (oh > gh) ay = (oh - gh) / 2;
    for (y = 0; y < g->gh; y++)
      {
         for (x = 0; x < g->gw; x++)
@@ -394,8 +390,6 @@
                   yy = (gh * yy) / g->h;
                   hh = ((gh * (ty + hh)) / g->h) - yy;
                }
-//             xx += ax;
-//             yy += ay;
              if (ELM_RECTS_INTERSECT(xx - wd->pan_x + ox, 
                                      yy  - wd->pan_y + oy,
                                      ww, hh,

Modified: trunk/TMP/st/elementary/src/lib/elm_widget.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_widget.c	2010-09-25 22:04:51 UTC (rev 52762)
+++ trunk/TMP/st/elementary/src/lib/elm_widget.c	2010-09-25 22:07:55 UTC (rev 52763)
@@ -921,7 +921,6 @@
 				      if (elm_widget_focus_jump(sd->resize_obj, forward))
                                          return 1;
 				      /* it returned 0 - it got to the last item and is past it */
-				      focus_next = 1;
 				   }
 			      }
 			 }

Modified: trunk/TMP/st/elementary/src/lib/elm_win.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_win.c	2010-09-25 22:04:51 UTC (rev 52762)
+++ trunk/TMP/st/elementary/src/lib/elm_win.c	2010-09-25 22:07:55 UTC (rev 52763)
@@ -408,8 +408,6 @@
 	if (maxh == -1) maxh = h;
 	else if ((h > 0) && (h < maxh)) maxh = h;
      }
-   if ((maxw >= 0) && (maxw < minw)) maxw = minw;
-   if ((maxh >= 0) && (maxh < minh)) maxh = minh;
    if (!xx) maxw = minw;
    else maxw = 32767;
    if (!xy) maxh = minh;

Modified: trunk/TMP/st/elementary/src/lib/els_box.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_box.c	2010-09-25 22:04:51 UTC (rev 52762)
+++ trunk/TMP/st/elementary/src/lib/els_box.c	2010-09-25 22:07:55 UTC (rev 52763)
@@ -4,15 +4,13 @@
 static void
 _smart_extents_calculate(Evas_Object *box, Evas_Object_Box_Data *priv, int horizontal, int homogeneous)
 {
-   Evas_Coord minw, minh, maxw, maxh, mnw, mnh;
+   Evas_Coord minw, minh, mnw, mnh;
    const Eina_List *l;
    Evas_Object_Box_Option *opt;
 
    /* FIXME: need to calc max */
    minw = 0;
    minh = 0;
-   maxw = -1;
-   maxh = -1;
    if (homogeneous)
      {
 	EINA_LIST_FOREACH(priv->children, l, opt)

Modified: trunk/TMP/st/elementary/src/lib/els_scroller.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_scroller.c	2010-09-25 22:04:51 UTC (rev 52762)
+++ trunk/TMP/st/elementary/src/lib/els_scroller.c	2010-09-25 22:07:55 UTC (rev 52763)
@@ -2052,9 +2052,8 @@
 _smart_scrollbar_bar_v_visibility_adjust(Smart_Data *sd)
 {
    int scroll_v_vis_change = 0;
-   Evas_Coord w, h, vw, vh;
+   Evas_Coord h, vw, vh;
 
-   w = sd->child.w;
    h = sd->child.h;
    evas_object_geometry_get(sd->pan_obj, NULL, NULL, &vw, &vh);
    if (sd->vbar_visible)
@@ -2121,10 +2120,9 @@
 _smart_scrollbar_bar_h_visibility_adjust(Smart_Data *sd)
 {
    int scroll_h_vis_change = 0;
-   Evas_Coord w, h, vw, vh;
+   Evas_Coord w, vw, vh;
 
    w = sd->child.w;
-   h = sd->child.h;
    evas_object_geometry_get(sd->pan_obj, NULL, NULL, &vw, &vh);
    if (sd->hbar_visible)
      {

Log:
  Clean up some dead code on elementary
  
Author:       bdilly
Date:         2010-09-25 15:08:56 -0700 (Sat, 25 Sep 2010)
New Revision: 52764

Modified:
  trunk/TMP/st/elementary/src/bin/test_genlist.c trunk/TMP/st/elementary/src/lib/els_tooltip.c 

Modified: trunk/TMP/st/elementary/src/bin/test_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_genlist.c	2010-09-25 22:07:55 UTC (rev 52763)
+++ trunk/TMP/st/elementary/src/bin/test_genlist.c	2010-09-25 22:08:56 UTC (rev 52764)
@@ -667,7 +667,6 @@
 Evas_Object *gl3_icon_get(void *data, Evas_Object *obj, const char *part)
 {
    const Testitem *tit = data;
-   char buf[PATH_MAX];
    if (!strcmp(part, "elm.swallow.icon"))
      {
         Evas_Object *lb;
@@ -678,23 +677,6 @@
         elm_label_label_set(lb, "ashj ascjscjh n asjkl hcjlh ls hzshnn zjh sh zxjcjsnd h dfw sdv edev efe fwefvv vsd cvs ws wf  fvwf wd fwe f  we wef we wfe rfwewef wfv wswf wefg sdfws w wsdcfwcf wsc vdv  sdsd sdcd cv wsc sdcv wsc d sdcdcsd sdcdsc wdvd sdcsd wscxcv wssvd sd");
         evas_object_show(lb);
         return lb;
-        
-	Evas_Object *bx = elm_box_add(obj);
-	Evas_Object *ic;
-	ic = elm_icon_add(obj);
-	snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
-	elm_icon_file_set(ic, buf, NULL);
-	elm_icon_scale_set(ic, 0, 0);
-	evas_object_show(ic);
-	elm_box_pack_end(bx, ic);
-	ic = elm_icon_add(obj);
-	elm_icon_file_set(ic, buf, NULL);
-	elm_icon_scale_set(ic, 0, 0);
-	evas_object_show(ic);
-	elm_box_pack_end(bx, ic);
-        elm_box_horizontal_set(bx, 1);
-	evas_object_show(bx);
-	return bx;
      }
    else if (!strcmp(part, "elm.swallow.end"))
      {

Modified: trunk/TMP/st/elementary/src/lib/els_tooltip.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_tooltip.c	2010-09-25 22:07:55 UTC (rev 52763)
+++ trunk/TMP/st/elementary/src/lib/els_tooltip.c	2010-09-25 22:08:56 UTC (rev 52764)
@@ -614,7 +614,6 @@
    return;
 
  error:
-   if (tt) _elm_tooltip_hide(tt);
    if (del_cb) del_cb((void *)data, owner, NULL);
 }

Log:
  Tooltip / Mouse Cursor support for elm_genlist / elm_gengrid items
  
  This patch add tooltip and mouse cursor support for items of genlist
  and gengrid and extends the elementary tests for tooltips and
  cursor
  
  By: Thiago Ribeiro Masaki <masaki@...>
  
  
Author:       bdilly
Date:         2010-09-27 11:18:37 -0700 (Mon, 27 Sep 2010)
New Revision: 52805

Modified:
  trunk/TMP/st/elementary/src/bin/test_cursor.c trunk/TMP/st/elementary/src/bin/test_tooltip.c trunk/TMP/st/elementary/src/lib/elm_gengrid.c trunk/TMP/st/elementary/src/lib/elm_genlist.c 

Modified: trunk/TMP/st/elementary/src/bin/test_cursor.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_cursor.c	2010-09-27 18:16:34 UTC (rev 52804)
+++ trunk/TMP/st/elementary/src/bin/test_cursor.c	2010-09-27 18:18:37 UTC (rev 52805)
@@ -2,6 +2,94 @@
 #include <Elementary_Cursor.h>
 #ifndef ELM_LIB_QUICKLAUNCH
 
+typedef struct _Testitem
+{
+   Elm_Gengrid_Item *item;
+   const char *path;
+   int mode;
+   int onoff;
+} Testitem;
+
+static Elm_Gengrid_Item_Class gic;
+
+char *
+grd_lbl_get(void *data, Evas_Object *obj, const char *part)
+{
+   const Testitem *ti = data;
+   char buf[256];
+   snprintf(buf, sizeof(buf), "Photo %s", ti->path);
+   return strdup(buf);
+}
+
+Evas_Object *
+grd_icon_get(void *data, Evas_Object *obj, const char *part)
+{
+   const Testitem *ti = data;
+   if (!strcmp(part, "elm.swallow.icon"))
+     {
+        Evas_Object *icon = elm_bg_add(obj);
+        elm_bg_file_set(icon, ti->path, NULL);
+        evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL,
+                                         1, 1);
+        evas_object_show(icon);
+        return icon;
+     }
+   return NULL;
+}
+
+static Elm_Genlist_Item_Class itct;
+
+static void
+glt_exp(void *data, Evas_Object *obj, void *event_info)
+{
+   Elm_Genlist_Item *it = event_info;
+   Evas_Object *gl = elm_genlist_item_genlist_get(it);
+   int val = (int)elm_genlist_item_data_get(it);
+   Elm_Genlist_Item *it1, *it2, *it3;
+
+   val *= 10;
+   it1 = elm_genlist_item_append(gl, &itct, (void *)(val + 1), it,
+                                 ELM_GENLIST_ITEM_NONE, NULL, NULL);
+   it2 = elm_genlist_item_append(gl, &itct, (void *)(val + 2), it,
+                                 ELM_GENLIST_ITEM_NONE, NULL, NULL);
+   it3 = elm_genlist_item_append(gl, &itct, (void *)(val + 3), it,
+                                 ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
+
+   elm_genlist_item_cursor_set(it1, ELM_CURSOR_HAND2);
+   elm_genlist_item_cursor_set(it2, ELM_CURSOR_HAND2);
+   elm_genlist_item_cursor_set(it3, ELM_CURSOR_HAND1);
+
+}
+
+static void
+glt_con(void *data, Evas_Object *obj, void *event_info)
+{
+   Elm_Genlist_Item *it = event_info;
+   elm_genlist_item_subitems_clear(it);
+}
+
+static void
+glt_exp_req(void *data, Evas_Object *obj, void *event_info)
+{
+   Elm_Genlist_Item *it = event_info;
+   elm_genlist_item_expanded_set(it, 1);
+}
+
+static void
+glt_con_req(void *data, Evas_Object *obj, void *event_info)
+{
+   Elm_Genlist_Item *it = event_info;
+   elm_genlist_item_expanded_set(it, 0);
+}
+
+char *
+glt_label_get(void *data, Evas_Object *obj, const char *part)
+{
+   char buf[256];
+   snprintf(buf, sizeof(buf), "Item mode %i", (int)data);
+   return strdup(buf);
+}
+
 void
 test_cursor(void *data, Evas_Object *obj, void *event_info)
 {
@@ -66,9 +154,25 @@
 void
 test_cursor2(void *data, Evas_Object *obj, void *event_info)
 {
-   Evas_Object *win, *bg, *bx, *o;
+   Evas_Object *win, *bg, *bx, *o, *grid, *gl;
+   Elm_Genlist_Item *it1, *it2, *it3;
    Elm_Toolbar_Item *tit;
    Elm_List_Item *lit;
+   char buf[PATH_MAX];
+   static Testitem ti[144];
+   int i, n;
+   const char *img[9] =
+     {
+        "panel_01.jpg",
+        "plant_01.jpg",
+        "rock_01.jpg",
+        "rock_02.jpg",
+        "sky_01.jpg",
+        "sky_02.jpg",
+        "sky_03.jpg",
+        "sky_04.jpg",
+        "wood_01.jpg",
+     };
 
    win = elm_win_add(NULL, "cursor", ELM_WIN_BASIC);
    elm_win_title_set(win, "Cursor 2");
@@ -112,6 +216,62 @@
    elm_list_go(o);
    evas_object_show(o);
 
+   gl = elm_genlist_add(win);
+   evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_show(gl);
+
+   itct.item_style     = "default";
+   itct.func.label_get = glt_label_get;
+
+   it1 = elm_genlist_item_append(gl, &itct, (void *) 1, NULL,
+                                 ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
+   it2 = elm_genlist_item_append(gl, &itct, (void *) 2, NULL,
+                                 ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
+   it3 = elm_genlist_item_append(gl, &itct, (void *) 3, NULL,
+                                 ELM_GENLIST_ITEM_NONE, NULL, NULL);
+
+   elm_genlist_item_cursor_set(it1, ELM_CURSOR_HAND1);
+   elm_genlist_item_cursor_set(it2, ELM_CURSOR_HAND1);
+   elm_genlist_item_cursor_set(it3, ELM_CURSOR_CROSS);
+
+   evas_object_smart_callback_add(gl, "expand,request", glt_exp_req, gl);
+   evas_object_smart_callback_add(gl, "contract,request", glt_con_req, gl);
+   evas_object_smart_callback_add(gl, "expanded", glt_exp, gl);
+   evas_object_smart_callback_add(gl, "clicked", NULL, gl);
+   evas_object_smart_callback_add(gl, "contracted", glt_con, gl);
+
+   elm_box_pack_end(bx, gl);
+
+   grid = elm_gengrid_add(win);
+   elm_gengrid_item_size_set(grid, 130, 130);
+   elm_gengrid_horizontal_set(grid, EINA_FALSE);
+   elm_gengrid_multi_select_set(grid, EINA_TRUE);
+   evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_fill_set(grid, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+   gic.item_style = "default";
+   gic.func.label_get = grd_lbl_get;
+   gic.func.icon_get = grd_icon_get;
+
+   n = 0;
+   for (i = 0; i < 3 * 3; i++)
+     {
+        snprintf(buf, sizeof(buf), "%s/images/%s", PACKAGE_DATA_DIR, img[n]);
+        n = (n + 1) % 9;
+        ti[i].mode = i;
+        ti[i].path = eina_stringshare_add(buf);
+        ti[i].item = elm_gengrid_item_append(grid, &gic, &(ti[i]), NULL, NULL);
+        if (n % 2)
+           elm_gengrid_item_cursor_set(ti[i].item, ELM_CURSOR_HAND1);
+        else
+           elm_gengrid_item_cursor_set(ti[i].item, ELM_CURSOR_CLOCK);
+        if (!(i % 5))
+           elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE);
+     }
+   elm_box_pack_end(bx, grid);
+   evas_object_show(grid);
+
    evas_object_resize(win, 320, 480);
    evas_object_show(win);
 }

Modified: trunk/TMP/st/elementary/src/bin/test_tooltip.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_tooltip.c	2010-09-27 18:16:34 UTC (rev 52804)
+++ trunk/TMP/st/elementary/src/bin/test_tooltip.c	2010-09-27 18:18:37 UTC (rev 52805)
@@ -4,6 +4,150 @@
 #endif
 #ifndef ELM_LIB_QUICKLAUNCH
 
+typedef struct _Testitem
+{
+   Elm_Gengrid_Item *item;
+   const char *path;
+   int mode;
+   int onoff;
+} Testitem;
+
+static Elm_Gengrid_Item_Class gic;
+
+char *
+grdt_lbl_get(void *data, Evas_Object *obj, const char *part)
+{
+   const Testitem *ti = data;
+   char buf[256];
+   snprintf(buf, sizeof(buf), "Photo %s", ti->path);
+   return strdup(buf);
+}
+
+Evas_Object *
+grdt_icon_get(void *data, Evas_Object *obj, const char *part)
+{
+   const Testitem *ti = data;
+   if (!strcmp(part, "elm.swallow.icon"))
+     {
+	Evas_Object *icon = elm_bg_add(obj);
+	elm_bg_file_set(icon, ti->path, NULL);
+	evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+	evas_object_show(icon);
+	return icon;
+     }
+   return NULL;
+}
+
+void
+test_gengrid_tooltip(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win, *bg, *grid;
+   static Testitem ti[144];
+   int i, n;
+   char buf[PATH_MAX];
+   const char *img[9] =
+     {
+       "panel_01.jpg",
+       "plant_01.jpg",
+       "rock_01.jpg",
+       "rock_02.jpg",
+       "sky_01.jpg",
+       "sky_02.jpg",
+       "sky_03.jpg",
+       "sky_04.jpg",
+       "wood_01.jpg",
+     };
+
+   win = elm_win_add(NULL, "grid", ELM_WIN_BASIC);
+   elm_win_title_set(win, "Tooltip");
+   elm_win_autodel_set(win, 1);
+
+   bg = elm_bg_add(win);
+   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_win_resize_object_add(win, bg);
+   evas_object_show(bg);
+
+   grid = elm_gengrid_add(win);
+   elm_gengrid_item_size_set(grid, 130, 130);
+   elm_gengrid_horizontal_set(grid, EINA_FALSE);
+   elm_gengrid_multi_select_set(grid, EINA_TRUE);
+   evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+   gic.item_style = "default";
+   gic.func.label_get = grdt_lbl_get;
+   gic.func.icon_get = grdt_icon_get;
+
+   n = 0;
+   for (i = 0; i < 3 * 3; i++)
+     {
+	snprintf(buf, sizeof(buf), "%s/images/%s", PACKAGE_DATA_DIR, img[n]);
+	n = (n + 1) % 9;
+	ti[i].mode = i;
+	ti[i].path = eina_stringshare_add(buf);
+	ti[i].item = elm_gengrid_item_append(grid, &gic, &(ti[i]), NULL, NULL);
+	if (n % 2)
+	  elm_gengrid_item_tooltip_text_set(ti[i].item, "Testing X");
+	else
+	  elm_gengrid_item_tooltip_text_set(ti[i].item, "Testing Y");
+	if (!(i % 5))
+	  elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE);
+     }
+
+   evas_object_show(grid);
+   elm_win_resize_object_add(win, grid);
+
+   evas_object_resize(win, 400, 400);
+   evas_object_show(win);
+}
+
+static Elm_Genlist_Item_Class itct;
+
+static void
+gltt_exp(void *data, Evas_Object *obj, void *event_info)
+{
+   Elm_Genlist_Item *it = event_info;
+   Evas_Object *gl = elm_genlist_item_genlist_get(it);
+   int val = (int)elm_genlist_item_data_get(it);
+   Elm_Genlist_Item *it1, *it2, *it3;
+
+   val *= 10;
+   it1 = elm_genlist_item_append(gl, &itct, (void *)(val + 1),it, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+   it2 = elm_genlist_item_append(gl, &itct, (void *)(val + 2), it, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+   it3 = elm_genlist_item_append(gl, &itct, (void *)(val + 3), it, ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
+
+   elm_genlist_item_tooltip_text_set(it1, "Testing A");
+   elm_genlist_item_tooltip_text_set(it2, "Testing B");
+   elm_genlist_item_tooltip_text_set(it3, "Testing C");
+}
+static void
+gltt_con(void *data, Evas_Object *obj, void *event_info)
+{
+   Elm_Genlist_Item *it = event_info;
+   elm_genlist_item_subitems_clear(it);
+}
+
+static void
+gltt_exp_req(void *data, Evas_Object *obj, void *event_info)
+{
+   Elm_Genlist_Item *it = event_info;
+   elm_genlist_item_expanded_set(it, 1);
+}
+
+static void
+gltt_con_req(void *data, Evas_Object *obj, void *event_info)
+{
+   Elm_Genlist_Item *it = event_info;
+   elm_genlist_item_expanded_set(it, 0);
+}
+
+char *
+gltt_label_get(void *data, Evas_Object *obj, const char *part)
+{
+   char buf[256];
+   snprintf(buf, sizeof(buf), "Item mode %i", (int)data);
+   return strdup(buf);
+}
+
 static Evas_Object *
 _tt_item_icon(void *data __UNUSED__, Evas_Object *obj, void *item __UNUSED__)
 {
@@ -178,10 +322,13 @@
 void
 test_tooltip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *bx, *tb, *bt, *se, *lst;
+   Evas_Object *win, *bg, *bx, *tb, *bt, *se, *lst, *gl;
+   Elm_Genlist_Item *it1, *it2, *it3;
    Elm_Toolbar_Item *ti;
    Elm_List_Item *li;
 
+   test_gengrid_tooltip(NULL, NULL, NULL);
+
    win = elm_win_add(NULL, "tooltip", ELM_WIN_BASIC);
    elm_win_title_set(win, "Tooltip");
    elm_win_autodel_set(win, 1);
@@ -290,8 +437,33 @@
    elm_box_pack_end(bx, lst);
    evas_object_show(lst);
 
+   gl = elm_genlist_add(win);
+   evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+   itct.item_style     = "default";
+   itct.func.label_get = gltt_label_get;
+
+   it1 = elm_genlist_item_append(gl, &itct, (void *)1, NULL, ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
+   it2 = elm_genlist_item_append(gl, &itct, (void *)2, NULL, ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
+   it3 = elm_genlist_item_append(gl, &itct, (void *)3, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+
+   elm_genlist_item_tooltip_text_set(it1, "Testing 1");
+   elm_genlist_item_tooltip_text_set(it2, "Testing 2");
+   elm_genlist_item_tooltip_text_set(it3, "Testing 3");
+
+   evas_object_smart_callback_add(gl, "expand,request", gltt_exp_req, gl);
+   evas_object_smart_callback_add(gl, "contract,request", gltt_con_req, gl);
+   evas_object_smart_callback_add(gl, "expanded", gltt_exp, gl);
+   evas_object_smart_callback_add(gl, "clicked", NULL, gl);
+   evas_object_smart_callback_add(gl, "contracted", gltt_con, gl);
+
+   elm_box_pack_end(bx, gl);
+   evas_object_show(gl);
+
+
    evas_object_show(win);
 
-   evas_object_resize(win, 400, 500);
+   evas_object_resize(win, 400, 680);
 }
 #endif

Modified: trunk/TMP/st/elementary/src/lib/elm_gengrid.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_gengrid.c	2010-09-27 18:16:34 UTC (rev 52804)
+++ trunk/TMP/st/elementary/src/lib/elm_gengrid.c	2010-09-27 18:18:37 UTC (rev 52805)
@@ -1,4 +1,5 @@
 #include <Elementary.h>
+#include <Elementary_Cursor.h>
 #include "elm_priv.h"
 
 /**
@@ -157,6 +158,16 @@
    Evas_Coord x, y, dx, dy;
    int relcount;
 
+   struct
+     {
+	const void *data;
+	Elm_Tooltip_Item_Content_Cb content_cb;
+	Evas_Smart_Cb del_cb;
+	const char *style;
+   } tooltip;
+
+   const char *mouse_cursor;
+
    Eina_Bool want_unrealize : 1;
    Eina_Bool realized : 1;
    Eina_Bool dragging : 1;
@@ -549,6 +560,18 @@
      edje_object_signal_emit(item->base.view, "elm,state,disabled", "elm");
 
    evas_object_show(item->base.view);
+
+   if (item->tooltip.content_cb)
+     {
+	elm_widget_item_tooltip_content_cb_set(item,
+					       item->tooltip.content_cb,
+					       item->tooltip.data, NULL);
+	elm_widget_item_tooltip_style_set(item, item->tooltip.style);
+     }
+
+   if (item->mouse_cursor)
+     elm_widget_item_cursor_set(item, item->mouse_cursor);
+
    item->realized = EINA_TRUE;
    item->want_unrealize = EINA_FALSE;
 }
@@ -663,6 +686,7 @@
    item->base.data = data;
    item->func.func = func;
    item->func.data = func_data;
+   item->mouse_cursor = NULL;
    return item;
 }
 
@@ -679,6 +703,8 @@
    item->wd->items = eina_list_remove(item->wd->items, item);
    if (item->long_timer) ecore_timer_del(item->long_timer);
    elm_widget_item_del(item);
+   if (item->tooltip.del_cb)
+     item->tooltip.del_cb((void *)item->tooltip.data, item->base.widget, item);
 }
 
 static void
@@ -1481,6 +1507,23 @@
    return item->disabled;
 }
 
+static Evas_Object *
+_elm_gengrid_item_label_create(void *data, Evas_Object *obj, void *item __UNUSED__)
+{
+   Evas_Object *label = elm_label_add(obj);
+   if (!label)
+     return NULL;
+   elm_object_style_set(label, "tooltip");
+   elm_label_label_set(label, data);
+   return label;
+}
+
+static void
+_elm_gengrid_item_label_del_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   eina_stringshare_del(data);
+}
+
 /**
  * Set the text to be shown in the gengrid item.
  *
@@ -1495,7 +1538,8 @@
 EAPI void
 elm_gengrid_item_tooltip_text_set(Elm_Gengrid_Item *item, const char *text)
 {
-   elm_widget_item_tooltip_text_set(item, text);
+   text = eina_stringshare_add(text);
+   elm_gengrid_item_tooltip_content_cb_set(item, _elm_gengrid_item_label_create, text, _elm_gengrid_item_label_del_cb);
 }
 
 /**
@@ -1521,7 +1565,29 @@
 EAPI void
 elm_gengrid_item_tooltip_content_cb_set(Elm_Gengrid_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb)
 {
-   elm_widget_item_tooltip_content_cb_set(item, func, data, del_cb);
+   EINA_SAFETY_ON_NULL_GOTO(item, error);
+
+   if ((item->tooltip.content_cb == func) && (item->tooltip.data == data))
+     return;
+
+   if (item->tooltip.del_cb)
+     item->tooltip.del_cb((void *)item->tooltip.data,
+			  item->base.widget, item);
+   item->tooltip.content_cb = func;
+   item->tooltip.data = data;
+   item->tooltip.del_cb = del_cb;
+   if (item->base.view)
+     {
+	elm_widget_item_tooltip_content_cb_set(item,
+					       item->tooltip.content_cb,
+					       item->tooltip.data, NULL);
+	elm_widget_item_tooltip_style_set(item, item->tooltip.style);
+     }
+
+   return;
+
+ error:
+   if (del_cb) del_cb((void *)data, NULL, NULL);
 }
 
 /**
@@ -1540,7 +1606,16 @@
 EAPI void
 elm_gengrid_item_tooltip_unset(Elm_Gengrid_Item *item)
 {
-   elm_widget_item_tooltip_unset(item);
+   if (item->base.view && item->tooltip.content_cb)
+       elm_widget_item_tooltip_unset(item);
+
+   if (item->tooltip.del_cb)
+     item->tooltip.del_cb((void *)item->tooltip.data, item->base.widget, item);
+   item->tooltip.del_cb = NULL;
+   item->tooltip.content_cb = NULL;
+   item->tooltip.data = NULL;
+   if (item->tooltip.style)
+     elm_gengrid_item_tooltip_style_set(item, NULL);
 }
 
 /**
@@ -1558,7 +1633,8 @@
 EAPI void
 elm_gengrid_item_tooltip_style_set(Elm_Gengrid_Item *item, const char *style)
 {
-   elm_widget_item_tooltip_style_set(item, style);
+   eina_stringshare_replace(&item->tooltip.style, style);
+   if (item->base.view) elm_widget_item_tooltip_style_set(item, style);
 }
 
 /**
@@ -1573,7 +1649,7 @@
 EAPI const char *
 elm_gengrid_item_tooltip_style_get(const Elm_Gengrid_Item *item)
 {
-   return elm_widget_item_tooltip_style_get(item);
+   return item->tooltip.style;
 }
 
 /**
@@ -1588,7 +1664,8 @@
 EAPI void
 elm_gengrid_item_cursor_set(Elm_Gengrid_Item *item, const char *cursor)
 {
-   elm_widget_item_cursor_set(item, cursor);
+   eina_stringshare_replace(&item->mouse_cursor, cursor);
+   if (item->base.view) elm_widget_item_cursor_set(item, cursor);
 }
 
 /**
@@ -1602,7 +1679,14 @@
 EAPI void
 elm_gengrid_item_cursor_unset(Elm_Gengrid_Item *item)
 {
-   elm_widget_item_cursor_unset(item);
+   if (!item->mouse_cursor)
+     return;
+
+   if (item->base.view)
+     elm_widget_item_cursor_unset(item);
+
+   eina_stringshare_del(item->mouse_cursor);
+   item->mouse_cursor = NULL;
 }
 
 /**

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-09-27 18:16:34 UTC (rev 52804)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-09-27 18:18:37 UTC (rev 52805)
@@ -1,4 +1,5 @@
 #include <Elementary.h>
+#include <Elementary_Cursor.h>
 #include "elm_priv.h"
 
 /**
@@ -310,6 +311,17 @@
    Elm_Genlist_Item *rel;
    int relcount;
    int walking;
+
+   struct
+     {
+	const void *data;
+	Elm_Tooltip_Item_Content_Cb content_cb;
+	Evas_Smart_Cb del_cb;
+	const char *style;
+   } tooltip;
+
+   const char *mouse_cursor;
+
    Eina_Bool before : 1;
 
    Eina_Bool want_unrealize : 1;
@@ -526,6 +538,10 @@
    if (it->parent)
      it->parent->items = eina_list_remove(it->parent->items, it);
    if (it->long_timer) ecore_timer_del(it->long_timer);
+
+   if (it->tooltip.del_cb)
+     it->tooltip.del_cb((void *)it->tooltip.data, it->base.widget, it);
+
    elm_widget_item_del(it);
 }
 
@@ -972,6 +988,18 @@
 	  }
 	if (!calc) evas_object_show(it->base.view);
      }
+
+   if (it->tooltip.content_cb)
+     {
+	elm_widget_item_tooltip_content_cb_set(it,
+					       it->tooltip.content_cb,
+					       it->tooltip.data, NULL);
+	elm_widget_item_tooltip_style_set(it, it->tooltip.style);
+     }
+
+   if (it->mouse_cursor)
+     elm_widget_item_cursor_set(it, it->mouse_cursor);
+
    it->realized = EINA_TRUE;
    it->want_unrealize = EINA_FALSE;
 }
@@ -1565,6 +1593,7 @@
    it->flags = flags;
    it->func.func = func;
    it->func.data = func_data;
+   it->mouse_cursor = NULL;
    return it;
 }
 
@@ -2897,6 +2926,23 @@
    it->wd->update_job = ecore_job_add(_update_job, it->wd);
 }
 
+static Evas_Object *
+_elm_genlist_item_label_create(void *data, Evas_Object *obj, void *item __UNUSED__)
+{
+   Evas_Object *label = elm_label_add(obj);
+   if (!label)
+     return NULL;
+   elm_object_style_set(label, "tooltip");
+   elm_label_label_set(label, data);
+   return label;
+}
+
+static void
+_elm_genlist_item_label_del_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   eina_stringshare_del(data);
+}
+
 /**
  * Set the text to be shown in the genlist item.
  *
@@ -2911,7 +2957,8 @@
 EAPI void
 elm_genlist_item_tooltip_text_set(Elm_Genlist_Item *item, const char *text)
 {
-   elm_widget_item_tooltip_text_set(item, text);
+   text = eina_stringshare_add(text);
+   elm_genlist_item_tooltip_content_cb_set(item, _elm_genlist_item_label_create, text, _elm_genlist_item_label_del_cb);
 }
 
 /**
@@ -2937,7 +2984,31 @@
 EAPI void
 elm_genlist_item_tooltip_content_cb_set(Elm_Genlist_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb)
 {
-   elm_widget_item_tooltip_content_cb_set(item, func, data, del_cb);
+   EINA_SAFETY_ON_NULL_GOTO(item, error);
+
+   if ((item->tooltip.content_cb == func) && (item->tooltip.data == data))
+     return;
+
+   if (item->tooltip.del_cb)
+     item->tooltip.del_cb((void *)item->tooltip.data,
+			  item->base.widget, item);
+
+   item->tooltip.content_cb = func;
+   item->tooltip.data = data;
+   item->tooltip.del_cb = del_cb;
+
+   if (item->base.view)
+     {
+	elm_widget_item_tooltip_content_cb_set(item,
+					       item->tooltip.content_cb,
+					       item->tooltip.data, NULL);
+	elm_widget_item_tooltip_style_set(item, item->tooltip.style);
+     }
+
+   return;
+
+ error:
+   if (del_cb) del_cb((void *)data, NULL, NULL);
 }
 
 /**
@@ -2956,7 +3027,16 @@
 EAPI void
 elm_genlist_item_tooltip_unset(Elm_Genlist_Item *item)
 {
-   elm_widget_item_tooltip_unset(item);
+   if (item->base.view && item->tooltip.content_cb)
+     elm_widget_item_tooltip_unset(item);
+
+   if (item->tooltip.del_cb)
+     item->tooltip.del_cb((void *)item->tooltip.data, item->base.widget, item);
+   item->tooltip.del_cb = NULL;
+   item->tooltip.content_cb = NULL;
+   item->tooltip.data = NULL;
+   if (item->tooltip.style)
+     elm_genlist_item_tooltip_style_set(item, NULL);
 }
 
 /**
@@ -2974,7 +3054,8 @@
 EAPI void
 elm_genlist_item_tooltip_style_set(Elm_Genlist_Item *item, const char *style)
 {
-   elm_widget_item_tooltip_style_set(item, style);
+   eina_stringshare_replace(&item->tooltip.style, style);
+   if (item->base.view) elm_widget_item_tooltip_style_set(item, style);
 }
 
 /**
@@ -2989,7 +3070,7 @@
 EAPI const char *
 elm_genlist_item_tooltip_style_get(const Elm_Genlist_Item *item)
 {
-   return elm_widget_item_tooltip_style_get(item);
+   return item->tooltip.style;
 }
 
 /**
@@ -3004,7 +3085,8 @@
 EAPI void
 elm_genlist_item_cursor_set(Elm_Genlist_Item *item, const char *cursor)
 {
-   elm_widget_item_cursor_set(item, cursor);
+   eina_stringshare_replace(&item->mouse_cursor, cursor);
+   if (item->base.view) elm_widget_item_cursor_set(item, cursor);
 }
 
 /**
@@ -3018,7 +3100,14 @@
 EAPI void
 elm_genlist_item_cursor_unset(Elm_Genlist_Item *item)
 {
-   elm_widget_item_cursor_unset(item);
+   if (!item->mouse_cursor)
+     return;
+
+   if (item->base.view)
+     elm_widget_item_cursor_unset(item);
+
+   eina_stringshare_del(item->mouse_cursor);
+   item->mouse_cursor = NULL;
 }
 
 /**

Log:
  Looks for parent cursors when mouse out a subobj
  
  It will set the parent cursor if it should be visible.
  
  
Author:       bdilly
Date:         2010-09-28 05:44:08 -0700 (Tue, 28 Sep 2010)
New Revision: 52848

Modified:
  trunk/TMP/st/elementary/src/bin/test_cursor.c trunk/TMP/st/elementary/src/lib/els_cursor.c 

Modified: trunk/TMP/st/elementary/src/bin/test_cursor.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_cursor.c	2010-09-28 09:41:20 UTC (rev 52847)
+++ trunk/TMP/st/elementary/src/bin/test_cursor.c	2010-09-28 12:44:08 UTC (rev 52848)
@@ -94,6 +94,7 @@
 test_cursor(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *win, *bg, *bx, *bt, *list, *entry, *ck;
+   Elm_List_Item *lit;
 
    win = elm_win_add(NULL, "cursor", ELM_WIN_BASIC);
    elm_win_title_set(win, "Cursor");
@@ -133,8 +134,12 @@
    evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_fill_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_object_cursor_set(list, ELM_CURSOR_WATCH);
-   elm_list_item_append(list, "watch over list", NULL, NULL,  NULL, NULL);
-   elm_list_item_append(list, "watch over list", NULL, NULL,  NULL, NULL);
+   lit = elm_list_item_append(list, "watch over list | hand1", NULL, NULL, NULL,
+                        NULL);
+   elm_list_item_cursor_set(lit, ELM_CURSOR_HAND1);
+   lit = elm_list_item_append(list, "watch over list | hand2", NULL, NULL, NULL,
+                        NULL);
+   elm_list_item_cursor_set(lit, ELM_CURSOR_HAND2);
    elm_list_go(list);
    evas_object_show(list);
 

Modified: trunk/TMP/st/elementary/src/lib/els_cursor.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_cursor.c	2010-09-28 09:41:20 UTC (rev 52847)
+++ trunk/TMP/st/elementary/src/lib/els_cursor.c	2010-09-28 12:44:08 UTC (rev 52848)
@@ -228,11 +228,31 @@
 static void
 _elm_cursor_mouse_out(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
+   Evas_Object *sobj_parent;
+   Elm_Cursor *pcur = NULL;
    Elm_Cursor *cur = data;
 
    if (!cur->visible) return;
    evas_event_freeze(cur->evas);
    cur->visible = EINA_FALSE;
+
+   sobj_parent = evas_object_data_get(cur->eventarea, "elm-parent");
+   while (sobj_parent != NULL)
+     {
+        pcur = evas_object_data_get((sobj_parent), _cursor_key);
+        if (pcur && pcur->visible)
+           break;
+        sobj_parent = evas_object_data_get(sobj_parent, "elm-parent");
+     }
+
+   if (pcur)
+     {
+        pcur->visible = EINA_FALSE;
+        evas_event_thaw(cur->evas);
+        _elm_cursor_mouse_in(pcur, NULL, NULL, NULL);
+        return;
+     }
+
    if ((!cur->engine_only) || (!cur->use_engine))
      {
         ecore_evas_object_cursor_set(cur->ee, NULL, ELM_OBJECT_LAYER_CURSOR,

Log:
  Remove dead assignments from elementary
  
  The only one remaining is on index code, related to the not yet
  implemented horizontal mode.
  
  
Author:       bdilly
Date:         2010-10-14 07:10:33 -0700 (Thu, 14 Oct 2010)
New Revision: 53396

Modified:
  trunk/TMP/st/elementary/src/bin/test_floating.c trunk/TMP/st/elementary/src/bin/test_genlist.c trunk/TMP/st/elementary/src/bin/test_map.c trunk/TMP/st/elementary/src/bin/test_menu.c trunk/TMP/st/elementary/src/bin/test_toolbar.c trunk/TMP/st/elementary/src/lib/elm_cnp_helper.c trunk/TMP/st/elementary/src/lib/elm_entry.c trunk/TMP/st/elementary/src/lib/elm_table.c trunk/TMP/st/elementary/src/lib/elm_widget.c 

Modified: trunk/TMP/st/elementary/src/bin/test_floating.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_floating.c	2010-10-14 14:09:49 UTC (rev 53395)
+++ trunk/TMP/st/elementary/src/bin/test_floating.c	2010-10-14 14:10:33 UTC (rev 53396)
@@ -63,7 +63,6 @@
 test_floating(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *win, *bg, *gl;
-   Elm_Genlist_Item *gli;
    int i;
    Ecore_Animator *ani;
 
@@ -91,12 +90,12 @@
 
    for (i = 0; i < 20; i++)
      {
-        gli = elm_genlist_item_append(gl, &itc1,
-                                      (void *)(long)i/* item data */,
-                                      NULL/* parent */,
-                                      ELM_GENLIST_ITEM_NONE,
-                                      gl_sel/* func */,
-                                      (void *)(long)(i * 10)/* func data */);
+        elm_genlist_item_append(gl, &itc1,
+                                (void *)(long)i/* item data */,
+                                NULL/* parent */,
+                                ELM_GENLIST_ITEM_NONE,
+                                gl_sel/* func */,
+                                (void *)(long)(i * 10)/* func data */);
      }
    evas_object_resize(win, 480, 800);
    evas_object_show(win);

Modified: trunk/TMP/st/elementary/src/bin/test_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_genlist.c	2010-10-14 14:09:49 UTC (rev 53395)
+++ trunk/TMP/st/elementary/src/bin/test_genlist.c	2010-10-14 14:10:33 UTC (rev 53396)
@@ -180,7 +180,6 @@
 my_gl_add(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *gl = data;
-   Elm_Genlist_Item *gli;
    static int i = 0;
 
    itc1.item_style     = "default";
@@ -189,12 +188,12 @@
    itc1.func.state_get = gl_state_get;
    itc1.func.del       = gl_del;
 
-   gli = elm_genlist_item_append(gl, &itc1,
-				 (void *)(long)i/* item data */,
-				 NULL/* parent */,
-				 ELM_GENLIST_ITEM_NONE,
-				 gl_sel/* func */,
-				 (void *)(long)(i * 10)/* func data */);
+   elm_genlist_item_append(gl, &itc1,
+                           (void *)(long)i/* item data */,
+                           NULL/* parent */,
+                           ELM_GENLIST_ITEM_NONE,
+                           gl_sel/* func */,
+                           (void *)(long)(i * 10)/* func data */);
    i++;
 }
 
@@ -202,7 +201,6 @@
 my_gl_insert_before(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *gl = data;
-   Elm_Genlist_Item *gli;
    static int i = 0;
    Elm_Genlist_Item *gli_selected;
 
@@ -219,12 +217,12 @@
        return ;
    }
 
-   gli = elm_genlist_item_insert_before(gl, &itc1,
-				 (void *)(long)i/* item data */,
-				 gli_selected /* item before */,
-				 ELM_GENLIST_ITEM_NONE,
-				 gl_sel/* func */,
-				 (void *)(long)(i * 10)/* func data */);
+   elm_genlist_item_insert_before(gl, &itc1,
+                                  (void *)(long)i/* item data */,
+                                  gli_selected /* item before */,
+                                  ELM_GENLIST_ITEM_NONE,
+                                  gl_sel/* func */,
+                                  (void *)(long)(i * 10)/* func data */);
    i++;
 }
 
@@ -232,7 +230,6 @@
 my_gl_insert_after(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *gl = data;
-   Elm_Genlist_Item *gli;
    static int i = 0;
    Elm_Genlist_Item *gli_selected;
 
@@ -249,10 +246,10 @@
        return ;
    }
 
-   gli = elm_genlist_item_insert_after(gl, &itc1,
-				 (void *)(long)i/* item data */,
-				 gli_selected /* item after */,
-				 ELM_GENLIST_ITEM_NONE,
+   elm_genlist_item_insert_after(gl, &itc1,
+                                 (void *)(long)i/* item data */,
+                                 gli_selected /* item after */,
+                                 ELM_GENLIST_ITEM_NONE,
 				 gl_sel/* func */,
 				 (void *)(long)(i * 10)/* func data */);
    i++;

Modified: trunk/TMP/st/elementary/src/bin/test_map.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_map.c	2010-10-14 14:09:49 UTC (rev 53395)
+++ trunk/TMP/st/elementary/src/bin/test_map.c	2010-10-14 14:10:33 UTC (rev 53396)
@@ -431,21 +431,20 @@
         evas_object_event_callback_add(map, EVAS_CALLBACK_MOVE, 
                                        _map_move_resize_cb, map);
 
-        Elm_Map_Marker *marker = 
-          elm_map_marker_add(map, 2.352, 48.857, itc1, itc_group1, &data1);
-        marker = elm_map_marker_add(map, 2.355, 48.857, itc1, itc_group1, &data3);
-        marker = elm_map_marker_add(map, 3, 48.857, itc2, itc_group1, &data2);
-        marker = elm_map_marker_add(map, 2.352, 49, itc2, itc_group1, &data1);
+        elm_map_marker_add(map, 2.352, 48.857, itc1, itc_group1, &data1);
+        elm_map_marker_add(map, 2.355, 48.857, itc1, itc_group1, &data3);
+        elm_map_marker_add(map, 3, 48.857, itc2, itc_group1, &data2);
+        elm_map_marker_add(map, 2.352, 49, itc2, itc_group1, &data1);
 
-        marker = elm_map_marker_add(map, 7.31451, 48.857127, itc1, itc_group1, &data10);
-        marker = elm_map_marker_add(map, 7.314704, 48.857119, itc1, itc_group1, &data4);
-        marker = elm_map_marker_add(map, 7.314704, 48.857119, itc2, itc_group1, &data5);
-        marker = elm_map_marker_add(map, 7.31432, 48.856785, itc2, itc_group1, &data6);
-        marker = elm_map_marker_add(map, 7.3148, 48.85725, itc1, itc_group2, &data7);
-        marker = elm_map_marker_add(map, 7.316445, 48.8572210000694, itc1, itc_group1, &data8);
-        marker = elm_map_marker_add(map, 7.316527000125, 48.85609, itc2, itc_group2, &data9);
-        marker = elm_map_marker_add(map, 7.3165409990833, 48.856078, itc2, itc_group1, &data11);
-        marker = elm_map_marker_add(map, 7.319812, 48.856561, itc2, itc_group2, &data10);
+        elm_map_marker_add(map, 7.31451, 48.857127, itc1, itc_group1, &data10);
+        elm_map_marker_add(map, 7.314704, 48.857119, itc1, itc_group1, &data4);
+        elm_map_marker_add(map, 7.314704, 48.857119, itc2, itc_group1, &data5);
+        elm_map_marker_add(map, 7.31432, 48.856785, itc2, itc_group1, &data6);
+        elm_map_marker_add(map, 7.3148, 48.85725, itc1, itc_group2, &data7);
+        elm_map_marker_add(map, 7.316445, 48.8572210000694, itc1, itc_group1, &data8);
+        elm_map_marker_add(map, 7.316527000125, 48.85609, itc2, itc_group2, &data9);
+        elm_map_marker_add(map, 7.3165409990833, 48.856078, itc2, itc_group1, &data11);
+        elm_map_marker_add(map, 7.319812, 48.856561, itc2, itc_group2, &data10);
 
         nb_elts = 13;
 

Modified: trunk/TMP/st/elementary/src/bin/test_menu.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_menu.c	2010-10-14 14:09:49 UTC (rev 53395)
+++ trunk/TMP/st/elementary/src/bin/test_menu.c	2010-10-14 14:10:33 UTC (rev 53396)
@@ -16,7 +16,7 @@
 _populate_4(Elm_Menu_Item *item)
 {
    Evas_Object *ic;
-   Elm_Menu_Item *item2, *item3;
+   Elm_Menu_Item *item2;
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
@@ -27,34 +27,34 @@
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
    elm_icon_file_set(ic, buf, NULL);
 
-   item2 = elm_menu_item_add(menu, item, ic, "menu 3", NULL, NULL);
+   elm_menu_item_add(menu, item, ic, "menu 3", NULL, NULL);
    
    elm_menu_item_separator_add(menu, item);
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
    elm_icon_file_set(ic, buf, NULL);
-   item3 = elm_menu_item_add(menu, item, ic, "Disabled item", NULL, NULL);
-   elm_menu_item_disabled_set(item3, 1);
+   item2 = elm_menu_item_add(menu, item, ic, "Disabled item", NULL, NULL);
+   elm_menu_item_disabled_set(item2, 1);
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
    elm_icon_file_set(ic, buf, NULL);
-   item3 = elm_menu_item_add(menu, item, ic, "Disabled item", NULL, NULL);
-   elm_menu_item_disabled_set(item3, 1);
+   item2 = elm_menu_item_add(menu, item, ic, "Disabled item", NULL, NULL);
+   elm_menu_item_disabled_set(item2, 1);
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
    elm_icon_file_set(ic, buf, NULL);
-   item3 = elm_menu_item_add(menu, item, ic, "Disabled item", NULL, NULL);
-   elm_menu_item_disabled_set(item3, 1);
+   item2 = elm_menu_item_add(menu, item, ic, "Disabled item", NULL, NULL);
+   elm_menu_item_disabled_set(item2, 1);
 }
 
 static void 
 _populate_3(Elm_Menu_Item *item)
 {
    Evas_Object *ic;
-   Elm_Menu_Item *item2, *item3;
+   Elm_Menu_Item *item2;
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
@@ -65,15 +65,15 @@
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
    elm_icon_file_set(ic, buf, NULL);
 
-   item2 = elm_menu_item_add(menu, item, ic, "menu 3", NULL, NULL);
+   elm_menu_item_add(menu, item, ic, "menu 3", NULL, NULL);
    
    elm_menu_item_separator_add(menu,item);
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
    elm_icon_file_set(ic, buf, NULL);
-   item3 = elm_menu_item_add(menu, item, ic, "Disabled item", NULL, NULL);
-   elm_menu_item_disabled_set(item3, 1);
+   item2 = elm_menu_item_add(menu, item, ic, "Disabled item", NULL, NULL);
+   elm_menu_item_disabled_set(item2, 1);
 }
 
 static void 
@@ -153,7 +153,7 @@
    evas_object_show(rect);
 
    menu = elm_menu_add(win);
-   item = elm_menu_item_add(menu, NULL, NULL, "first item", NULL, NULL);
+   elm_menu_item_add(menu, NULL, NULL, "first item", NULL, NULL);
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);

Modified: trunk/TMP/st/elementary/src/bin/test_toolbar.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_toolbar.c	2010-10-14 14:09:49 UTC (rev 53395)
+++ trunk/TMP/st/elementary/src/bin/test_toolbar.c	2010-10-14 14:10:33 UTC (rev 53396)
@@ -123,7 +123,7 @@
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
    elm_icon_file_set(ic, buf, NULL);
-   menu_item = elm_menu_item_add(menu, NULL, ic, "Elementary", tb_5, ph4);
+   elm_menu_item_add(menu, NULL, ic, "Elementary", tb_5, ph4);
 
    elm_box_pack_end(bx, tb);
    evas_object_show(tb);

Modified: trunk/TMP/st/elementary/src/lib/elm_cnp_helper.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_cnp_helper.c	2010-10-14 14:09:49 UTC (rev 53395)
+++ trunk/TMP/st/elementary/src/lib/elm_cnp_helper.c	2010-10-14 14:10:33 UTC (rev 53396)
@@ -1584,7 +1584,7 @@
         free(info);
         return NULL;
      }
-   len = snprintf(info->filename,len,"%s/%sXXXXXX",tmppath, "elmcnpitem-");
+   snprintf(info->filename,len,"%s/%sXXXXXX",tmppath, "elmcnpitem-");
 
    info->fd = mkstemp(info->filename);
 

Modified: trunk/TMP/st/elementary/src/lib/elm_entry.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_entry.c	2010-10-14 14:09:49 UTC (rev 53395)
+++ trunk/TMP/st/elementary/src/lib/elm_entry.c	2010-10-14 14:10:33 UTC (rev 53396)
@@ -2491,7 +2491,7 @@
    const char *set;
    char *insert;
    Eina_Bool goes_in;
-   int read_idx, last_read_idx = 0, read_char, copy_count;
+   int read_idx, last_read_idx = 0, read_char;
 
    if (!as || (!as->accepted && !as->rejected))
       return;
@@ -2509,7 +2509,6 @@
 
    insert = *text;
    read_idx = evas_string_char_next_get(*text, 0, &read_char);
-   copy_count = read_idx;
    while (read_char)
      {
         int cmp_idx, cmp_char;

Modified: trunk/TMP/st/elementary/src/lib/elm_table.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_table.c	2010-10-14 14:09:49 UTC (rev 53395)
+++ trunk/TMP/st/elementary/src/lib/elm_table.c	2010-10-14 14:10:33 UTC (rev 53396)
@@ -71,7 +71,7 @@
                                                    dir, next);
 
    if (list_free)
-     items = list_free((Eina_List *)items);
+     list_free((Eina_List *)items);
 
    return ret;
 }

Modified: trunk/TMP/st/elementary/src/lib/elm_widget.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_widget.c	2010-10-14 14:09:49 UTC (rev 53395)
+++ trunk/TMP/st/elementary/src/lib/elm_widget.c	2010-10-14 14:10:33 UTC (rev 53396)
@@ -2210,13 +2210,10 @@
    Evas_Object *o;
    INTERNAL_ENTRY;
    list = evas_object_smart_members_get(obj);
-   if ((list = evas_object_smart_members_get(obj)))
+   EINA_LIST_FREE(list, o)
      {
-        EINA_LIST_FREE(list, o)
-          {
-             if (evas_object_data_get(o, "_elm_leaveme")) continue;
-             evas_object_hide(o);
-          }
+        if (evas_object_data_get(o, "_elm_leaveme")) continue;
+        evas_object_hide(o);
      }
    _if_focused_revert(obj);
 }

Log:
  Remove dead assignments
  
Author:       bdilly
Date:         2010-10-22 13:11:31 -0700 (Fri, 22 Oct 2010)
New Revision: 53782

Modified:
  trunk/TMP/st/elementary/src/bin/test_weather.c trunk/TMP/st/elementary/src/lib/elc_hoverlist.c 

Modified: trunk/TMP/st/elementary/src/bin/test_weather.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_weather.c	2010-10-22 19:58:49 UTC (rev 53781)
+++ trunk/TMP/st/elementary/src/bin/test_weather.c	2010-10-22 20:11:31 UTC (rev 53782)
@@ -89,7 +89,6 @@
 
    module[0] = NULL;
    weather[0] = eweather_object_add(evas_object_evas_get(win));
-   eweather = eweather_object_eweather_get(weather[0]);
    evas_object_size_hint_weight_set(weather[0], EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(weather[0], -1.0, -1.0);
    elm_flip_content_front_set(fl, weather[0]);

Modified: trunk/TMP/st/elementary/src/lib/elc_hoverlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elc_hoverlist.c	2010-10-22 19:58:49 UTC (rev 53781)
+++ trunk/TMP/st/elementary/src/lib/elc_hoverlist.c	2010-10-22 20:11:31 UTC (rev 53782)
@@ -71,9 +71,7 @@
 _item_new(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Smart_Cb func, const void *data)
 {
    Elm_Hoverlist_Item *it;
-   Widget_Data *wd;
 
-   wd = elm_widget_data_get(obj);
    it = elm_widget_item_new(obj, Elm_Hoverlist_Item);
    if (!it)
      return NULL;

Log:
  Change toolbar API for consistency with other widgets
  
  BIG FAT WARNING: lots of changes on toolbar API
  
  Trying to get a lib with easy to use API, I'm changing toolbar API
  to be consistent with genlist / gengrid widgets and to be more concise.
  
  Functions select_next, select_first, select_last, unselect, unselect_all
  get all are gone.
  You can do this calling a combination of the others functions.
  
  This commit changes toolbar to use inlist, and previous items can be
  get.
  
  So now we have:
  Elm_Toolbar_Item *elm_toolbar_first_item_get(const Evas_Object *obj)
  Elm_Toolbar_Item *elm_toolbar_last_item_get(const Evas_Object *obj)
  Elm_Toolbar_Item *elm_toolbar_item_next_get(const Elm_Toolbar_Item *it)
  Elm_Toolbar_Item *elm_toolbar_item_prev_get(const Elm_Toolbar_Item *it)
  Eina_Bool elm_toolbar_item_selected_get(const Elm_Toolbar_Item)
  void elm_toolbar_item_selected_set(Elm_Toolbar_Item *item, Eina_Bool selected)
  Elm_Toolbar_Item *elm_toolbar_selected_item_get(const Evas_Object *obj)
  
  With these functions you can iterate over the items list getting /
  selecting the item you need.
  
  Another big change is that elm_toolbar_item_add is gone. Now you can
  insert items in the position you want, with the functions append,
  prepend, insert after, insert before (a relative item).
  
  If you don't like any changes or have a case of use for something
  that should be different, please ping me.
  
  At last, includes ELM_TOOLBAR_ITEM_CHECK_OR_RETURN on EAPI that
  receives items.
  
  
Author:       bdilly
Date:         2010-10-26 03:29:24 -0700 (Tue, 26 Oct 2010)
New Revision: 53894

Modified:
  trunk/TMP/st/elementary/src/bin/config.c trunk/TMP/st/elementary/src/bin/test_cursor.c trunk/TMP/st/elementary/src/bin/test_flip.c trunk/TMP/st/elementary/src/bin/test_panel.c trunk/TMP/st/elementary/src/bin/test_toolbar.c trunk/TMP/st/elementary/src/bin/test_tooltip.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_toolbar.c 

Modified: trunk/TMP/st/elementary/src/bin/config.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/config.c	2010-10-26 10:22:30 UTC (rev 53893)
+++ trunk/TMP/st/elementary/src/bin/config.c	2010-10-26 10:29:24 UTC (rev 53894)
@@ -949,20 +949,20 @@
    evas_object_size_hint_weight_set(tb, 1.0, 0.0);
    evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-   sizing = it = elm_toolbar_item_add(tb, "zoom-fit-best", "Sizing", _cf_sizing, win);
+   sizing = it = elm_toolbar_item_append(tb, "zoom-fit-best", "Sizing", _cf_sizing, win);
    elm_toolbar_item_priority_set(it, 100);
 
-   it = elm_toolbar_item_add(tb, "preferences-desktop-theme", "Theme", _cf_themes, win);
+   it = elm_toolbar_item_append(tb, "preferences-desktop-theme", "Theme", _cf_themes, win);
    elm_toolbar_item_priority_set(it, 90);
 
-   elm_toolbar_item_add(tb, "preferences-desktop-font", "Fonts", _cf_fonts, win);
+   elm_toolbar_item_append(tb, "preferences-desktop-font", "Fonts", _cf_fonts, win);
 
-   it = elm_toolbar_item_add(tb, "system-users", "Profiles", _cf_profiles, win);
+   it = elm_toolbar_item_append(tb, "system-users", "Profiles", _cf_profiles, win);
    elm_toolbar_item_priority_set(it, 90);
 
-   elm_toolbar_item_add(tb, "system-run", "Scrolling", _cf_scrolling, win);
-   elm_toolbar_item_add(tb, "video-display", "Rendering", _cf_rendering, win);
-   elm_toolbar_item_add(tb, "appointment-new", "Caches", _cf_caches, win);
+   elm_toolbar_item_append(tb, "system-run", "Scrolling", _cf_scrolling, win);
+   elm_toolbar_item_append(tb, "video-display", "Rendering", _cf_rendering, win);
+   elm_toolbar_item_append(tb, "appointment-new", "Caches", _cf_caches, win);
 
    elm_box_pack_end(bx0, tb);
    evas_object_show(tb);
@@ -989,7 +989,7 @@
    evas_object_show(fl);
    evas_object_data_set(win, "flip", fl);
 
-   elm_toolbar_item_select(sizing);
+   elm_toolbar_item_selected_set(sizing, EINA_TRUE);
 }
 
 static void

Modified: trunk/TMP/st/elementary/src/bin/test_cursor.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_cursor.c	2010-10-26 10:22:30 UTC (rev 53893)
+++ trunk/TMP/st/elementary/src/bin/test_cursor.c	2010-10-26 10:29:24 UTC (rev 53894)
@@ -200,12 +200,12 @@
    elm_toolbar_homogenous_set(o, 0);
    evas_object_size_hint_weight_set(o, 0.0, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0);
-   tit = elm_toolbar_item_add(o, NULL, "Bogosity", NULL, NULL);
+   tit = elm_toolbar_item_append(o, NULL, "Bogosity", NULL, NULL);
    elm_toolbar_item_cursor_set(tit, ELM_CURSOR_BOGOSITY);
-   tit = elm_toolbar_item_add(o, NULL, "Unset", NULL, NULL);
+   tit = elm_toolbar_item_append(o, NULL, "Unset", NULL, NULL);
    elm_toolbar_item_cursor_set(tit, ELM_CURSOR_BOGOSITY);
    elm_toolbar_item_cursor_unset(tit);
-   tit = elm_toolbar_item_add(o, NULL, "Xterm", NULL, NULL);
+   tit = elm_toolbar_item_append(o, NULL, "Xterm", NULL, NULL);
    elm_toolbar_item_cursor_set(tit, ELM_CURSOR_XTERM);
    elm_box_pack_end(bx, o);
    evas_object_show(o);

Modified: trunk/TMP/st/elementary/src/bin/test_flip.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_flip.c	2010-10-26 10:22:30 UTC (rev 53893)
+++ trunk/TMP/st/elementary/src/bin/test_flip.c	2010-10-26 10:29:24 UTC (rev 53894)
@@ -239,10 +239,10 @@
    evas_object_size_hint_weight_set(tb, 0.0, 0.0);
    evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
 
-   elm_toolbar_item_add(tb, "arrow_left", "Hello", NULL, NULL);
-   elm_toolbar_item_add(tb, "arrow_right", "Out", NULL, NULL);
-   elm_toolbar_item_add(tb, "home", "There", NULL, NULL);
-   elm_toolbar_item_add(tb, "refresh", "World", NULL, NULL);
+   elm_toolbar_item_append(tb, "arrow_left", "Hello", NULL, NULL);
+   elm_toolbar_item_append(tb, "arrow_right", "Out", NULL, NULL);
+   elm_toolbar_item_append(tb, "home", "There", NULL, NULL);
+   elm_toolbar_item_append(tb, "refresh", "World", NULL, NULL);
    
    elm_box_pack_end(o, tb);
    evas_object_show(tb);

Modified: trunk/TMP/st/elementary/src/bin/test_panel.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_panel.c	2010-10-26 10:22:30 UTC (rev 53893)
+++ trunk/TMP/st/elementary/src/bin/test_panel.c	2010-10-26 10:29:24 UTC (rev 53894)
@@ -18,6 +18,7 @@
 static void
 _tstatus(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
+   Elm_Toolbar_Item *sel;
    const char *status;
 
    if (elm_panel_hidden_get((Evas_Object*)data))
@@ -25,12 +26,14 @@
    else
      status = "shown";
    printf("The top panel is currently %s\n", status);
-   elm_toolbar_item_unselect_all(obj);
+   sel = elm_toolbar_selected_item_get(obj);
+   elm_toolbar_item_selected_set(sel, EINA_FALSE);
 }
 
 static void
 _bstatus(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
+   Elm_Toolbar_Item *sel;
    const char *status;
 
    if (elm_panel_hidden_get((Evas_Object*)data))
@@ -38,7 +41,8 @@
    else
      status = "shown";
    printf("The bottom panel is currently %s\n", status);
-   elm_toolbar_item_unselect_all(obj);
+   sel = elm_toolbar_selected_item_get(obj);
+   elm_toolbar_item_selected_set(sel, EINA_FALSE);
 }
 
 static char *
@@ -182,7 +186,7 @@
    evas_object_size_hint_align_set(toolbar, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_show(toolbar);
 
-   elm_toolbar_item_add(toolbar, "home", "Hello", _tstatus, panel);
+   elm_toolbar_item_append(toolbar, "home", "Hello", _tstatus, panel);
 
    elm_panel_content_set(panel, toolbar);
    elm_box_pack_end(vbx, panel);
@@ -246,7 +250,7 @@
    evas_object_size_hint_align_set(toolbar, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_show(toolbar);
 
-   elm_toolbar_item_add(toolbar, "home", "Hello", _bstatus, panel);
+   elm_toolbar_item_append(toolbar, "home", "Hello", _bstatus, panel);
 
    elm_panel_content_set(panel, toolbar);
    elm_box_pack_end(vbx, panel);

Modified: trunk/TMP/st/elementary/src/bin/test_toolbar.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_toolbar.c	2010-10-26 10:22:30 UTC (rev 53893)
+++ trunk/TMP/st/elementary/src/bin/test_toolbar.c	2010-10-26 10:29:24 UTC (rev 53894)
@@ -75,23 +75,23 @@
    ph3 = elm_photo_add(win);
    ph4 = elm_photo_add(win);
 
-   item = elm_toolbar_item_add(tb, "document-print", "Hello", tb_1, ph1);
+   item = elm_toolbar_item_append(tb, "document-print", "Hello", tb_1, ph1);
    elm_toolbar_item_disabled_set(item, EINA_TRUE);
    elm_toolbar_item_priority_set(item, 100);
 
-   item = elm_toolbar_item_add(tb, "folder-new", "World", tb_2, ph1);
+   item = elm_toolbar_item_append(tb, "folder-new", "World", tb_2, ph1);
    elm_toolbar_item_priority_set(item, -100);
 
-   item = elm_toolbar_item_add(tb, "object-rotate-right", "H", tb_3, ph4);
+   item = elm_toolbar_item_append(tb, "object-rotate-right", "H", tb_3, ph4);
    elm_toolbar_item_priority_set(item, 150);
 
-   item = elm_toolbar_item_add(tb, "mail-send", "Comes", tb_4, ph4);
+   item = elm_toolbar_item_append(tb, "mail-send", "Comes", tb_4, ph4);
    elm_toolbar_item_priority_set(item, 0);
 
-   item = elm_toolbar_item_add(tb, "clock", "Elementary", tb_5, ph4);
+   item = elm_toolbar_item_append(tb, "clock", "Elementary", tb_5, ph4);
    elm_toolbar_item_priority_set(item, -200);
 
-   item = elm_toolbar_item_add(tb, "refresh", "Menu", NULL, NULL);
+   item = elm_toolbar_item_append(tb, "refresh", "Menu", NULL, NULL);
    elm_toolbar_item_menu_set(item, 1);
    elm_toolbar_item_priority_set(item, -999999);
    elm_toolbar_menu_parent_set(tb, win);
@@ -185,23 +185,23 @@
    ph3 = elm_photo_add(win);
    ph4 = elm_photo_add(win);
 
-   item = elm_toolbar_item_add(tb, "document-print", "Hello", tb_1, ph1);
+   item = elm_toolbar_item_append(tb, "document-print", "Hello", tb_1, ph1);
    elm_toolbar_item_disabled_set(item, EINA_TRUE);
    elm_toolbar_item_priority_set(item, -100);
 
-   item = elm_toolbar_item_add(tb, "folder-new", "World", tb_2, ph1);
+   item = elm_toolbar_item_append(tb, "folder-new", "World", tb_2, ph1);
    elm_toolbar_item_priority_set(item, 100);
 
-   item = elm_toolbar_item_add(tb, "object-rotate-right", "H", tb_3, ph4);
+   item = elm_toolbar_item_append(tb, "object-rotate-right", "H", tb_3, ph4);
    elm_toolbar_item_priority_set(item, -150);
 
-   item = elm_toolbar_item_add(tb, "mail-send", "Comes", tb_4, ph4);
+   item = elm_toolbar_item_append(tb, "mail-send", "Comes", tb_4, ph4);
    elm_toolbar_item_priority_set(item, -200);
 
-   item = elm_toolbar_item_add(tb, "clock", "Elementary", tb_5, ph4);
+   item = elm_toolbar_item_append(tb, "clock", "Elementary", tb_5, ph4);
    elm_toolbar_item_priority_set(item, 0);
 
-   item = elm_toolbar_item_add(tb, "refresh", "Menu", NULL, NULL);
+   item = elm_toolbar_item_append(tb, "refresh", "Menu", NULL, NULL);
    elm_toolbar_item_menu_set(item, 1);
    elm_toolbar_item_priority_set(item, -999999);
    elm_toolbar_menu_parent_set(tb, win);
@@ -295,23 +295,23 @@
    ph3 = elm_photo_add(win);
    ph4 = elm_photo_add(win);
 
-   item = elm_toolbar_item_add(tb, "document-print", "Hello", tb_1, ph1);
+   item = elm_toolbar_item_append(tb, "document-print", "Hello", tb_1, ph1);
    elm_toolbar_item_disabled_set(item, EINA_TRUE);
    elm_toolbar_item_priority_set(item, 0);
 
-   item = elm_toolbar_item_add(tb, "folder-new", "World", tb_2, ph1);
+   item = elm_toolbar_item_append(tb, "folder-new", "World", tb_2, ph1);
    elm_toolbar_item_priority_set(item, -200);
 
-   item = elm_toolbar_item_add(tb, "object-rotate-right", "H", tb_3, ph4);
+   item = elm_toolbar_item_append(tb, "object-rotate-right", "H", tb_3, ph4);
    elm_toolbar_item_priority_set(item, 1);
 
-   item = elm_toolbar_item_add(tb, "mail-send", "Comes", tb_4, ph4);
+   item = elm_toolbar_item_append(tb, "mail-send", "Comes", tb_4, ph4);
    elm_toolbar_item_priority_set(item, -10);
 
-   item = elm_toolbar_item_add(tb, "clock", "Elementary", tb_5, ph4);
+   item = elm_toolbar_item_append(tb, "clock", "Elementary", tb_5, ph4);
    elm_toolbar_item_priority_set(item, 50);
 
-   item = elm_toolbar_item_add(tb, "refresh", "Menu", NULL, NULL);
+   item = elm_toolbar_item_append(tb, "refresh", "Menu", NULL, NULL);
    elm_toolbar_item_menu_set(item, 1);
    elm_toolbar_item_priority_set(item, 999999);
    elm_toolbar_menu_parent_set(tb, win);

Modified: trunk/TMP/st/elementary/src/bin/test_tooltip.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_tooltip.c	2010-10-26 10:22:30 UTC (rev 53893)
+++ trunk/TMP/st/elementary/src/bin/test_tooltip.c	2010-10-26 10:29:24 UTC (rev 53894)
@@ -288,10 +288,10 @@
    elm_box_pack_end(bx, tb);
    evas_object_show(tb);
 
-   ti = elm_toolbar_item_add(tb, NULL, "Open", NULL, NULL);
+   ti = elm_toolbar_item_append(tb, NULL, "Open", NULL, NULL);
    elm_toolbar_item_tooltip_text_set(ti, "Opens a file");
 
-   ti = elm_toolbar_item_add(tb, NULL, "Icon", NULL, NULL);
+   ti = elm_toolbar_item_append(tb, NULL, "Icon", NULL, NULL);
    elm_toolbar_item_tooltip_content_cb_set
      (ti, _tt_item_icon, (void *)456L, _tt_item_icon_del);
    elm_toolbar_item_tooltip_style_set(ti, "transparent");

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-10-26 10:22:30 UTC (rev 53893)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-10-26 10:29:24 UTC (rev 53894)
@@ -1171,17 +1171,27 @@
    EAPI Evas_Object      *elm_toolbar_add(Evas_Object *parent);
    EAPI void              elm_toolbar_icon_size_set(Evas_Object *obj, int icon_size);
    EAPI int               elm_toolbar_icon_size_get(const Evas_Object *obj);
-   EAPI Elm_Toolbar_Item *elm_toolbar_item_add(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
+   EAPI Elm_Toolbar_Item *elm_toolbar_item_append(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
+   EAPI Elm_Toolbar_Item *elm_toolbar_item_prepend(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
+   EAPI Elm_Toolbar_Item *elm_toolbar_item_insert_before(Evas_Object *obj, Elm_Toolbar_Item *before, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
+   EAPI Elm_Toolbar_Item *elm_toolbar_item_insert_after(Evas_Object *obj, Elm_Toolbar_Item *after, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
+   EAPI Elm_Toolbar_Item *elm_toolbar_first_item_get(const Evas_Object *obj);
+   EAPI Elm_Toolbar_Item *elm_toolbar_last_item_get(const Evas_Object *obj);
+   EAPI Elm_Toolbar_Item *elm_toolbar_item_next_get(const Elm_Toolbar_Item *item);
+   EAPI Elm_Toolbar_Item *elm_toolbar_item_prev_get(const Elm_Toolbar_Item *item);
+   EAPI Evas_Object      *elm_toolbar_item_toolbar_get(const Elm_Toolbar_Item *item);
    EAPI void              elm_toolbar_item_priority_set(Elm_Toolbar_Item *item, int priority);
    EAPI int               elm_toolbar_item_priority_get(const Elm_Toolbar_Item *item);
    EAPI const char       *elm_toolbar_item_icon_name_get(const Elm_Toolbar_Item *item);
    EAPI Evas_Object      *elm_toolbar_item_icon_get(const Elm_Toolbar_Item *item);
    EAPI const char       *elm_toolbar_item_label_get(const Elm_Toolbar_Item *item);
-   EAPI Eina_Bool         elm_toolbar_item_selected_get(const Elm_Toolbar_Item *item);
    EAPI void              elm_toolbar_item_label_set(Elm_Toolbar_Item *item, const char *label);
+   EAPI Elm_Toolbar_Item *elm_toolbar_item_find_by_label(const Evas_Object *obj, const char *label);
+   EAPI Eina_Bool         elm_toolbar_item_selected_get(const Elm_Toolbar_Item *item);
+   EAPI void              elm_toolbar_item_selected_set(Elm_Toolbar_Item *item, Eina_Bool selected);
+   EAPI Elm_Toolbar_Item *elm_toolbar_selected_item_get(const Evas_Object *obj);
    EAPI void              elm_toolbar_item_del(Elm_Toolbar_Item *item);
-   EAPI void              elm_toolbar_item_del_cb_set(Elm_Toolbar_Item *it, Evas_Smart_Cb func);
-   EAPI void              elm_toolbar_item_select(Elm_Toolbar_Item *item);
+   EAPI void              elm_toolbar_item_del_cb_set(Elm_Toolbar_Item *item, Evas_Smart_Cb func);
    EAPI Eina_Bool         elm_toolbar_item_disabled_get(const Elm_Toolbar_Item *item);
    EAPI void              elm_toolbar_item_disabled_set(Elm_Toolbar_Item *item, Eina_Bool disabled);
    EAPI void              elm_toolbar_item_separator_set(Elm_Toolbar_Item *item, Eina_Bool separator);
@@ -1192,8 +1202,6 @@
    EAPI Eina_Bool         elm_toolbar_homogenous_get(const Evas_Object *obj);
    EAPI void              elm_toolbar_menu_parent_set(Evas_Object *obj, Evas_Object *parent);
    EAPI Evas_Object      *elm_toolbar_menu_parent_get(const Evas_Object *obj);
-   EAPI void              elm_toolbar_item_unselect_all(Evas_Object *obj);
-   EAPI void              elm_toolbar_item_unselect(Elm_Toolbar_Item *item);
    EAPI void              elm_toolbar_align_set(Evas_Object *obj, double align);
    EAPI double            elm_toolbar_align_get(const Evas_Object *obj);
    EAPI void              elm_toolbar_item_menu_set(Elm_Toolbar_Item *item, Eina_Bool menu);
@@ -1210,15 +1218,6 @@
    EAPI const char       *elm_toolbar_item_cursor_style_get(const Elm_Toolbar_Item *item);
    EAPI void              elm_toolbar_item_cursor_engine_only_set(Elm_Toolbar_Item *item, Eina_Bool engine_only);
    EAPI Eina_Bool         elm_toolbar_item_cursor_engine_only_get(const Elm_Toolbar_Item *item);
-
-   EAPI Eina_List        *elm_toolbar_item_get_all(Evas_Object *obj);
-   EAPI Elm_Toolbar_Item *elm_toolbar_item_get_first(Evas_Object *obj);
-   EAPI Elm_Toolbar_Item *elm_toolbar_item_get_last(Evas_Object *obj);
-   EAPI Elm_Toolbar_Item *elm_toolbar_item_get_next(Evas_Object *obj);
-   EAPI Elm_Toolbar_Item *elm_toolbar_item_select_next(Evas_Object *obj);
-   EAPI Elm_Toolbar_Item *elm_toolbar_item_select_first(Evas_Object *obj);
-   EAPI Elm_Toolbar_Item *elm_toolbar_item_select_last(Evas_Object *obj);
-   EAPI Elm_Toolbar_Item *elm_toolbar_item_find_by_label(Evas_Object *obj, const char *label);
    /* smart callbacks called:
     * "clicked" - when the user clicks on a toolbar item and becomes selected
     */

Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_toolbar.c	2010-10-26 10:22:30 UTC (rev 53893)
+++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c	2010-10-26 10:29:24 UTC (rev 53894)
@@ -14,8 +14,8 @@
 {
    Evas_Object *scr, *bx;
    Evas_Object *menu_parent;
-   Eina_List *items;
-   Elm_Toolbar_Item *more_item;
+   Eina_Inlist *items;
+   Elm_Toolbar_Item *more_item, *selected_item;
    Elm_Toolbar_Shrink_Mode shrink_mode;
    int icon_size;
    double align;
@@ -25,6 +25,7 @@
 struct _Elm_Toolbar_Item
 {
    Elm_Widget_Item base;
+   EINA_INLIST;
    const char *label;
    const char *icon_str;
    Evas_Object *icon;
@@ -40,9 +41,17 @@
    Eina_Bool menu : 1;
 };
 
+#define ELM_TOOLBAR_ITEM_FROM_INLIST(item)      \
+  ((item) ? EINA_INLIST_CONTAINER_GET(item, Elm_Toolbar_Item) : NULL)
+
+#define ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(it, ...)                       \
+   ELM_WIDGET_ITEM_CHECK_OR_RETURN((Elm_Widget_Item *)it, __VA_ARGS__); \
+   ELM_CHECK_WIDTYPE(it->base.widget, widtype) __VA_ARGS__;
+
 static const char *widtype = NULL;
 static void _item_show(Elm_Toolbar_Item *it);
 static void _item_select(Elm_Toolbar_Item *it);
+static void _item_unselect(Elm_Toolbar_Item *it);
 static void _item_disable(Elm_Toolbar_Item *it, Eina_Bool disabled);
 static void _del_pre_hook(Evas_Object *obj);
 static void _del_hook(Evas_Object *obj);
@@ -83,26 +92,32 @@
 }
 
 static void
+_item_unselect(Elm_Toolbar_Item *item)
+{
+   Widget_Data *wd;
+   if ((!item) || (!item->selected)) return;
+   wd = elm_widget_data_get(item->base.widget);
+   if (!wd) return;
+   item->selected = EINA_FALSE;
+   wd->selected_item = NULL;
+   edje_object_signal_emit(item->base.view, "elm,state,unselected", "elm");
+}
+
+static void
 _item_select(Elm_Toolbar_Item *it)
 {
    Elm_Toolbar_Item *it2;
    Widget_Data *wd = elm_widget_data_get(it->base.widget);
    Evas_Object *obj2;
-   const Eina_List *l;
 
    if (!wd) return;
    if ((it->selected) || (it->disabled) || (it->separator)) return;
-   EINA_LIST_FOREACH(wd->items, l, it2)
-     {
-	if (it2->selected)
-	  {
-	     it2->selected = EINA_FALSE;
-	     edje_object_signal_emit
-               (it2->base.view, "elm,state,unselected", "elm");
-	     break;
-	  }
-     }
+
+   it2 = elm_toolbar_selected_item_get(it->base.widget);
+   _item_unselect(it2);
+
    it->selected = EINA_TRUE;
+   wd->selected_item = it;
    edje_object_signal_emit(it->base.view, "elm,state,selected", "elm");
    _item_show(it);
    obj2 = it->base.widget;
@@ -123,8 +138,10 @@
 static void
 _menu_hide(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
+   Elm_Toolbar_Item *selected;
    Elm_Toolbar_Item *it = data;
-   elm_toolbar_item_unselect_all(it->base.widget);
+   selected = elm_toolbar_selected_item_get(it->base.widget);
+   _item_unselect(selected);
 }
 
 static void
@@ -165,16 +182,19 @@
 _del_pre_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-   Elm_Toolbar_Item *it;
+   Elm_Toolbar_Item *it, *next;
 
    if (!wd) return;
-   EINA_LIST_FREE(wd->items, it)
+   it = ELM_TOOLBAR_ITEM_FROM_INLIST(wd->items);
+   while(it)
      {
+        next = ELM_TOOLBAR_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
         elm_widget_item_pre_notify_del(it);
 	eina_stringshare_del(it->label);
 	if (it->icon) evas_object_del(it->icon);
 	if ((!wd->menu_parent) && (it->o_menu)) evas_object_del(it->o_menu);
         elm_widget_item_del(it);
+        it = next;
      }
 }
 
@@ -191,7 +211,6 @@
 _theme_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-   const Eina_List *l;
    Elm_Toolbar_Item *it;
    const char *style = elm_widget_style_get(obj);
    double scale = 0;
@@ -200,7 +219,7 @@
    elm_smart_scroller_object_theme_set(obj, wd->scr, "toolbar", "base", elm_widget_style_get(obj));
    scale = (elm_widget_scale_get(obj) * _elm_config->scale);
 //   edje_object_scale_set(wd->scr, scale);
-   EINA_LIST_FOREACH(wd->items, l, it)
+   EINA_INLIST_FOREACH(wd->items, it)
      {
         Evas_Object *view = it->base.view;
         Evas_Coord mw, mh;
@@ -311,7 +330,6 @@
 {
    Widget_Data *wd = elm_widget_data_get(data);
    Evas_Coord mw, mh, vw, vh, w, h;
-   const Eina_List *l;
    Elm_Toolbar_Item *it;
 
    if (!wd) return;
@@ -326,8 +344,14 @@
    if (wd->shrink_mode == ELM_TOOLBAR_SHRINK_MENU)
      {
         Evas_Coord iw = 0;
-        Eina_List *sorted = eina_list_sort(eina_list_clone(wd->items), 0,
-                                           _toolbar_item_prio_compare_cb);
+        Eina_List *sorted = NULL;
+
+        EINA_INLIST_FOREACH(wd->items, it)
+          {
+             sorted = eina_list_sorted_insert(sorted,
+                                    _toolbar_item_prio_compare_cb, it);
+          }
+
         EINA_LIST_FREE(sorted, it)
           {
              Evas_Coord ciw;
@@ -348,7 +372,7 @@
              _item_menu_create(wd, wd->more_item);
              menu = elm_toolbar_item_menu_get(wd->more_item);
 
-             EINA_LIST_FOREACH(wd->items, l, it)
+             EINA_INLIST_FOREACH(wd->items, it)
                {
                  if (wd->more_item == it) continue;
                  if (!it->prio.visible)
@@ -378,7 +402,7 @@
         else
           {
              /* All items are visible, show them all (except for the "More" button, of course). */
-             EINA_LIST_FOREACH(wd->items, l, it)
+             EINA_INLIST_FOREACH(wd->items, it)
                {
                   if (it == wd->more_item)
                     evas_object_hide(it->base.view);
@@ -392,7 +416,7 @@
      }
    else
      {
-        EINA_LIST_FOREACH(wd->items, l, it)
+        EINA_INLIST_FOREACH(wd->items, it)
           {
              if (it->selected)
                {
@@ -417,6 +441,68 @@
    _els_box_layout(o, priv, 1, wd->homogeneous);
 }
 
+static Elm_Toolbar_Item *
+_item_new(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb func, const void *data)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Evas_Object *icon_obj;
+   Evas_Coord mw, mh;
+   Elm_Toolbar_Item *it;
+
+   icon_obj = elm_icon_add(obj);
+   if (!icon_obj) return NULL;
+   it = elm_widget_item_new(obj, Elm_Toolbar_Item);
+   if (!it)
+     {
+        evas_object_del(icon_obj);
+        return NULL;
+     }
+   it->label = eina_stringshare_add(label);
+   it->prio.visible = 1;
+   it->prio.priority = 0;
+   it->func = func;
+   it->separator = EINA_FALSE;
+   it->base.data = data;
+   it->base.view = edje_object_add(evas_object_evas_get(obj));
+   if (_item_icon_set(icon_obj, "toolbar/", icon))
+     {
+        it->icon = icon_obj;
+        it->icon_str = eina_stringshare_add(icon);
+     }
+   else
+     {
+        it->icon = NULL;
+        it->icon_str = NULL;
+        evas_object_del(icon_obj);
+     }
+
+   _elm_theme_object_set(obj, it->base.view, "toolbar", "item",
+                         elm_widget_style_get(obj));
+   edje_object_signal_callback_add(it->base.view, "elm,action,click", "elm",
+                                   _select, it);
+   elm_widget_sub_object_add(obj, it->base.view);
+   if (it->icon)
+     {
+        int ms = 0;
+
+        ms = ((double)wd->icon_size * _elm_config->scale);
+        evas_object_size_hint_min_set(it->icon, ms, ms);
+        evas_object_size_hint_max_set(it->icon, ms, ms);
+        edje_object_part_swallow(it->base.view, "elm.swallow.icon", it->icon);
+        evas_object_show(it->icon);
+        elm_widget_sub_object_add(obj, it->icon);
+     }
+   edje_object_part_text_set(it->base.view, "elm.text", it->label);
+   mw = mh = -1;
+   elm_coords_finger_size_adjust(1, &mw, 1, &mh);
+   edje_object_size_min_restricted_calc(it->base.view, &mw, &mh, mw, mh);
+   elm_coords_finger_size_adjust(1, &mw, 1, &mh);
+   evas_object_size_hint_weight_set(it->base.view, -1.0, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(it->base.view, 0.5, EVAS_HINT_FILL);
+   evas_object_size_hint_min_set(it->base.view, mw, mh);
+   return it;
+}
+
 /**
  * Add a toolbar object to @p parent.
  *
@@ -446,6 +532,7 @@
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
    wd->more_item = NULL;
+   wd->selected_item = NULL;
    wd->scr = elm_smart_scroller_add(e);
    elm_smart_scroller_widget_set(wd->scr, obj);
    elm_smart_scroller_object_theme_set(obj, wd->scr, "toolbar", "base", "default");
@@ -513,87 +600,222 @@
 }
 
 /**
- * Add an item to the toolbar.
+ * Append item to the toolbar
  *
  * @param obj The toolbar object
  * @param icon The icon string
  * @param label The label of the item
  * @param func The function to call when the item is clicked
  * @param data The data to associate with the item
+ * @return The toolbar item, or NULL upon failure
  *
+ * @ingroup Toolbar
+ */
+EAPI Elm_Toolbar_Item *
+elm_toolbar_item_append(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb func, const void *data)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return NULL;
+
+   Elm_Toolbar_Item *it = _item_new(obj, icon, label, func, data);
+   if (!it) return NULL;
+
+   wd->items = eina_inlist_append(wd->items, EINA_INLIST_GET(it));
+   evas_object_box_append(wd->bx, it->base.view);
+   evas_object_show(it->base.view);
+   _sizing_eval(obj);
+
+   return it;
+}
+
+/**
+ * Prepend item to the toolbar
+ *
+ * @param obj The toolbar object
+ * @param icon The icon string
+ * @param label The label of the item
+ * @param func The function to call when the item is clicked
+ * @param data The data to associate with the item
  * @return The toolbar item, or NULL upon failure
  *
  * @ingroup Toolbar
  */
 EAPI Elm_Toolbar_Item *
-elm_toolbar_item_add(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb func, const void *data)
+elm_toolbar_item_prepend(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb func, const void *data)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
-   Evas_Object *icon_obj;
-   Evas_Coord mw, mh;
-   Elm_Toolbar_Item *it;
+   if (!wd) return NULL;
 
+   Elm_Toolbar_Item *it = _item_new(obj, icon, label, func, data);
+   if (!it) return NULL;
+
+   wd->items = eina_inlist_prepend(wd->items, EINA_INLIST_GET(it));
+   evas_object_box_prepend(wd->bx, it->base.view);
+   evas_object_show(it->base.view);
+   _sizing_eval(obj);
+
+   return it;
+}
+
+/**
+ * Insert item before another in the toolbar
+ *
+ * @param obj The toolbar object
+ * @param before The item to insert before
+ * @param icon The icon string
+ * @param label The label of the item
+ * @param func The function to call when the item is clicked
+ * @param data The data to associate with the item
+ * @return The toolbar item, or NULL upon failure
+ *
+ * @ingroup Toolbar
+ */
+EAPI Elm_Toolbar_Item *
+elm_toolbar_item_insert_before(Evas_Object *obj, Elm_Toolbar_Item *before, const char *icon, const char *label, Evas_Smart_Cb func, const void *data)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(before, NULL);
+   Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
-   icon_obj = elm_icon_add(obj);
-   if (!icon_obj) return NULL;
-   it = elm_widget_item_new(obj, Elm_Toolbar_Item);
-   if (!it) 
-     {
-        evas_object_del(icon_obj);
-        return NULL;
-     }
-   wd->items = eina_list_append(wd->items, it);
-   it->label = eina_stringshare_add(label);
-   it->prio.visible = 1;
-   it->prio.priority = 0;
-   it->func = func;
-   it->separator = EINA_FALSE;
-   it->base.data = data;
-   it->base.view = edje_object_add(evas_object_evas_get(obj));
-   if (_item_icon_set(icon_obj, "toolbar/", icon))
-     {
-       it->icon = icon_obj;
-       it->icon_str = eina_stringshare_add(icon);
-     }
-   else
-     {
-       it->icon = NULL;
-       it->icon_str = NULL;
-       evas_object_del(icon_obj);
-     }
 
-   _elm_theme_object_set(obj, it->base.view, "toolbar", "item", 
-                         elm_widget_style_get(obj));
-   edje_object_signal_callback_add(it->base.view, "elm,action,click", "elm",
-				   _select, it);
-   elm_widget_sub_object_add(obj, it->base.view);
-   if (it->icon)
-     {
-        int ms = 0;
+   Elm_Toolbar_Item *it = _item_new(obj, icon, label, func, data);
+   if (!it) return NULL;
 
-        ms = ((double)wd->icon_size * _elm_config->scale);
-	evas_object_size_hint_min_set(it->icon, ms, ms);
-	evas_object_size_hint_max_set(it->icon, ms, ms);
-	edje_object_part_swallow(it->base.view, "elm.swallow.icon", it->icon);
-	evas_object_show(it->icon);
-	elm_widget_sub_object_add(obj, it->icon);
-     }
-   edje_object_part_text_set(it->base.view, "elm.text", it->label);
-   mw = mh = -1;
-   elm_coords_finger_size_adjust(1, &mw, 1, &mh);
-   edje_object_size_min_restricted_calc(it->base.view, &mw, &mh, mw, mh);
-   elm_coords_finger_size_adjust(1, &mw, 1, &mh);
-   evas_object_size_hint_weight_set(it->base.view, -1.0, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(it->base.view, 0.5, EVAS_HINT_FILL);
-   evas_object_size_hint_min_set(it->base.view, mw, mh);
-   evas_object_box_append(wd->bx, it->base.view);
+   wd->items = eina_inlist_prepend_relative(wd->items, EINA_INLIST_GET(it),
+                                            EINA_INLIST_GET(before));
+   evas_object_box_insert_before(wd->bx, it->base.view, before->base.view);
    evas_object_show(it->base.view);
    _sizing_eval(obj);
+
    return it;
 }
 
 /**
+ * Insert item after another in the toolbar
+ *
+ * @param obj The toolbar object
+ * @param after The item to insert after
+ * @param icon The icon string
+ * @param label The label of the item
+ * @param func The function to call when the item is clicked
+ * @param data The data to associate with the item
+ * @return The toolbar item, or NULL upon failure
+ *
+ * @ingroup Toolbar
+ */
+EAPI Elm_Toolbar_Item *
+elm_toolbar_item_insert_after(Evas_Object *obj, Elm_Toolbar_Item *after, const char *icon, const char *label, Evas_Smart_Cb func, const void *data)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(after, NULL);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return NULL;
+
+   Elm_Toolbar_Item *it = _item_new(obj, icon, label, func, data);
+   if (!it) return NULL;
+
+   wd->items = eina_inlist_append_relative(wd->items, EINA_INLIST_GET(it),
+                                            EINA_INLIST_GET(after));
+   evas_object_box_insert_after(wd->bx, it->base.view, after->base.view);
+   evas_object_show(it->base.view);
+   _sizing_eval(obj);
+
+   return it;
+}
+
+/**
+ * Get the first item in the toolbar
+ *
+ * @param obj The toolbar object
+ * @return The first item, or NULL if none
+ *
+ * @ingroup Toolbar
+ */
+EAPI Elm_Toolbar_Item *
+elm_toolbar_first_item_get(const Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd || !wd->items) return NULL;
+   Elm_Toolbar_Item *it = ELM_TOOLBAR_ITEM_FROM_INLIST(wd->items);
+   return it;
+}
+
+/**
+ * Get the last item in the toolbar
+ *
+ * @return The last item, or NULL if none
+ *
+ * @ingroup Toolbar
+ */
+EAPI Elm_Toolbar_Item *
+elm_toolbar_last_item_get(const Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd || !wd->items) return NULL;
+   Elm_Toolbar_Item *it = ELM_TOOLBAR_ITEM_FROM_INLIST(wd->items->last);
+   return it;
+}
+
+/**
+ * Get the next item in the toolbar
+ *
+ * This returns the item after the item @p it.
+ *
+ * @param it The item
+ * @return The item after @p it, or NULL if none
+ *
+ * @ingroup Toolbar
+ */
+EAPI Elm_Toolbar_Item *
+elm_toolbar_item_next_get(const Elm_Toolbar_Item *item)
+{
+   Elm_Toolbar_Item *next;
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item, NULL);
+   next = ELM_TOOLBAR_ITEM_FROM_INLIST(EINA_INLIST_GET(item)->next);
+   return next;
+}
+
+/**
+ * Get the previous item in the toolbar
+ *
+ * This returns the item before the item @p it.
+ *
+ * @param it The item
+ * @return The item before @p it, or NULL if none
+ *
+ * @ingroup Toolbar
+ */
+EAPI Elm_Toolbar_Item *
+elm_toolbar_item_prev_get(const Elm_Toolbar_Item *item)
+{
+   Elm_Toolbar_Item *prev;
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item, NULL);
+   prev = ELM_TOOLBAR_ITEM_FROM_INLIST(EINA_INLIST_GET(item)->prev);
+   return prev;
+}
+
+/**
+ * Get the toolbar object from an item
+ *
+ * This returns the toolbar object itself that an item belongs to.
+ *
+ * @param it The item
+ * @return The toolbar object
+ *
+ * @ingroup Toolbar
+ */
+EAPI Evas_Object *
+elm_toolbar_item_toolbar_get(const Elm_Toolbar_Item *item)
+{
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item, NULL);
+   return item->base.widget;
+}
+
+/**
  * Sets the priority of a toolbar item. This is used only when the toolbar expand mode
  * is set to ELM_TOOLBAR_SHRINK_MENU: when space is at a premium, items with low priority
  * will be removed from the toolbar and added to a dynamically-created menu, while items
@@ -607,7 +829,7 @@
 EAPI void
 elm_toolbar_item_priority_set(Elm_Toolbar_Item *item, int priority)
 {
-    if (!item) return;
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item);
     if (item->prio.priority == priority) return;
     item->prio.priority = priority;
     _resize(item->base.widget, NULL, NULL, NULL);
@@ -624,8 +846,8 @@
 EAPI int
 elm_toolbar_item_priority_get(const Elm_Toolbar_Item *item)
 {
-    if (!item) return 0;
-    return item->prio.priority;
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item, 0);
+   return item->prio.priority;
 }
 
 /**
@@ -639,7 +861,7 @@
 EAPI Evas_Object *
 elm_toolbar_item_icon_get(const Elm_Toolbar_Item *item)
 {
-   if (!item) return NULL;
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item, NULL);
    return item->icon;
 }
 
@@ -654,7 +876,7 @@
 EAPI const char *
 elm_toolbar_item_icon_name_get(const Elm_Toolbar_Item *item)
 {
-   if (!item) return NULL;
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item, NULL);
    return item->icon_str;
 }
 
@@ -669,26 +891,11 @@
 EAPI const char *
 elm_toolbar_item_label_get(const Elm_Toolbar_Item *item)
 {
-   if (!item) return NULL;
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item, NULL);
    return item->label;
 }
 
 /**
- * Get the selected state of @p item.
- *
- * @param item The toolbar item
- * @return If true, the item is selected
- *
- * @ingroup Toolbar
- */
-EAPI Eina_Bool
-elm_toolbar_item_selected_get(const Elm_Toolbar_Item *item)
-{
-   if (!item) return EINA_FALSE;
-   return item->selected;
-}
-
-/**
  * Set the label associated with @p item.
  *
  * @param item The toolbar item
@@ -701,7 +908,7 @@
 {
    Evas_Coord mw = -1, mh = -1;
 
-   if (!item) return;
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item);
    eina_stringshare_replace(&item->label, label);
    edje_object_part_text_set(item->base.view, "elm.text", item->label);
 
@@ -713,8 +920,68 @@
    evas_object_size_hint_min_set(item->base.view, mw, mh);
 }
 
+/**
+ * Get the selected state of @p item.
+ *
+ * @param item The toolbar item
+ * @return If true, the item is selected
+ *
+ * @ingroup Toolbar
+ */
+EAPI Eina_Bool
+elm_toolbar_item_selected_get(const Elm_Toolbar_Item *item)
+{
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item, EINA_FALSE);
+   return item->selected;
+}
 
 /**
+ * Set the selected state of an item
+ *
+ * This sets the selected state (1 selected, 0 not selected) of the given
+ * item @p it. If a new item is selected the previosly selected will be
+ * unselected.
+ *
+ * @param it The item
+ * @param selected The selected state
+ *
+ * @ingroup Genlist
+ */
+EAPI void
+elm_toolbar_item_selected_set(Elm_Toolbar_Item *item, Eina_Bool selected)
+{
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item);
+   Widget_Data *wd = elm_widget_data_get(item->base.widget);
+   if (!wd) return;
+
+   if (item->selected == selected) return;
+
+   if (selected)
+     _item_select(item);
+   else
+     _item_unselect(item);
+}
+
+/**
+ * Get the selectd item in the toolbar
+ *
+ * If no item is selected, NULL is returned.
+ *
+ * @param obj The toolbar object
+ * @return The selected item, or NULL if none.
+ *
+ * @ingroup Toolbar
+ */
+EAPI Elm_Toolbar_Item *
+elm_toolbar_selected_item_get(const Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return NULL;
+   return wd->selected_item;
+}
+
+/**
  * Delete a toolbar item.
  *
  * @param it The toolbar item
@@ -722,21 +989,21 @@
  * @ingroup Toolbar
  */
 EAPI void
-elm_toolbar_item_del(Elm_Toolbar_Item *it)
+elm_toolbar_item_del(Elm_Toolbar_Item *item)
 {
    Widget_Data *wd;
    Evas_Object *obj2;
 
-   if ((!it) || (!it->base.widget)) return;
-   wd = elm_widget_data_get(it->base.widget);
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item);
+   wd = elm_widget_data_get(item->base.widget);
    if (!wd) return;
-   obj2 = it->base.widget;
-   elm_widget_item_pre_notify_del(it);
-   wd->items = eina_list_remove(wd->items, it);
-   eina_stringshare_del(it->label);
-   eina_stringshare_del(it->icon_str);
-   if (it->icon) evas_object_del(it->icon);
-   elm_widget_item_del(it);
+   obj2 = item->base.widget;
+   elm_widget_item_pre_notify_del(item);
+   wd->items = eina_inlist_remove(wd->items, EINA_INLIST_GET(item));
+   eina_stringshare_del(item->label);
+   eina_stringshare_del(item->icon_str);
+   if (item->icon) evas_object_del(item->icon);
+   elm_widget_item_del(item);
    _theme_hook(obj2);
 }
 
@@ -749,26 +1016,13 @@
  * @ingroup Toolbar
  */
 EAPI void
-elm_toolbar_item_del_cb_set(Elm_Toolbar_Item *it, Evas_Smart_Cb func)
+elm_toolbar_item_del_cb_set(Elm_Toolbar_Item *item, Evas_Smart_Cb func)
 {
-   elm_widget_item_del_cb_set(it, func);
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item);
+   elm_widget_item_del_cb_set(item, func);
 }
 
 /**
- * Select the toolbar item @p item.
- *
- * @param item The toolbar item
- *
- * @ingroup Toolbar
- */
-EAPI void
-elm_toolbar_item_select(Elm_Toolbar_Item *item)
-{
-   if (!item) return;
-   _item_select(item);
-}
-
-/**
  * Get the disabled state of @p item.
  *
  * @param item The toolbar item
@@ -779,7 +1033,7 @@
 EAPI Eina_Bool
 elm_toolbar_item_disabled_get(const Elm_Toolbar_Item *item)
 {
-   if (!item) return EINA_FALSE;
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item, EINA_FALSE);
    return item->disabled;
 }
 
@@ -794,7 +1048,7 @@
 EAPI void
 elm_toolbar_item_disabled_set(Elm_Toolbar_Item *item, Eina_Bool disabled)
 {
-   if (!item) return;
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item);
    _item_disable(item, disabled);
 }
 
@@ -809,7 +1063,7 @@
 EAPI void
 elm_toolbar_item_separator_set(Elm_Toolbar_Item *item, Eina_Bool separator)
 {
-   if (!item) return;
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item);
    if (item->separator == separator) return;
    item->separator = separator;
    _theme_hook(item->base.view);
@@ -826,7 +1080,7 @@
 EAPI Eina_Bool
 elm_toolbar_item_separator_get(const Elm_Toolbar_Item *item)
 {
-   if (!item) return EINA_FALSE;
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item, EINA_FALSE);
    return item->separator;
 }
 
@@ -863,7 +1117,8 @@
      {
         elm_smart_scroller_policy_set(wd->scr, ELM_SMART_SCROLLER_POLICY_OFF, ELM_SMART_SCROLLER_POLICY_OFF);
 
-        wd->more_item = elm_toolbar_item_add(obj, "more_menu", "More", NULL, NULL);
+        wd->more_item = elm_toolbar_item_append(obj, "more_menu", "More",
+                                                NULL, NULL);
         elm_toolbar_item_priority_set(wd->more_item, INT_MAX);
      }
    else
@@ -937,14 +1192,13 @@
 EAPI void
 elm_toolbar_menu_parent_set(Evas_Object *obj, Evas_Object *parent)
 {
-   Eina_List *l;
    Elm_Toolbar_Item *it;
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
 
    if ((!wd) || (!parent)) return;
    wd->menu_parent = parent;
-   EINA_LIST_FOREACH(wd->items, l, it)
+   EINA_INLIST_FOREACH(wd->items, it)
      {
         if (it->o_menu)
           elm_menu_parent_set(it->o_menu, wd->menu_parent);
@@ -970,49 +1224,6 @@
 }
 
 /**
- * Unselect all of the items in the toolbar.
- *
- * @param obj The toolbar object
- *
- * @ingroup Toolbar
- */
-EAPI void
-elm_toolbar_item_unselect_all(Evas_Object *obj)
-{
-   Eina_List *l;
-   Elm_Toolbar_Item *it;
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-
-   if (!wd) return;
-   EINA_LIST_FOREACH(wd->items, l, it)
-     {
-        if (it->selected)
-          {
-             it->selected = EINA_FALSE;
-             edje_object_signal_emit
-               (it->base.view, "elm,state,unselected", "elm");
-             break;
-          }
-     }
-}
-
-/**
- * Unselect the specified toolbar item.
- *
- * @param item The toolbar item
- *
- * @ingroup Toolbar
- */
-EAPI void
-elm_toolbar_item_unselect(Elm_Toolbar_Item *item)
-{
-   if ((!item) || (!item->selected)) return;
-   item->selected = EINA_FALSE;
-   edje_object_signal_emit(item->base.view, "elm,state,unselected", "elm");
-}
-
-/**
  * Set the alignment of the items.
  *
  * @param obj The toolbar object
@@ -1061,9 +1272,10 @@
 EAPI void
 elm_toolbar_item_menu_set(Elm_Toolbar_Item *item, Eina_Bool menu)
 {
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item);
    Widget_Data *wd = elm_widget_data_get(item->base.widget);
+   if (!wd) return;
 
-   if ((!wd) || (!item)) return;
    if (item->menu == menu) return;
    item->menu = menu;
    if (menu) _item_menu_create(wd, item);
@@ -1084,6 +1296,7 @@
 EAPI void
 elm_toolbar_item_tooltip_text_set(Elm_Toolbar_Item *item, const char *text)
 {
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item);
    elm_widget_item_tooltip_text_set(item, text);
 }
 
@@ -1110,6 +1323,7 @@
 EAPI void
 elm_toolbar_item_tooltip_content_cb_set(Elm_Toolbar_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb)
 {
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item);
    elm_widget_item_tooltip_content_cb_set(item, func, data, del_cb);
 }
 
@@ -1129,6 +1343,7 @@
 EAPI void
 elm_toolbar_item_tooltip_unset(Elm_Toolbar_Item *item)
 {
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item);
    elm_widget_item_tooltip_unset(item);
 }
 
@@ -1147,6 +1362,7 @@
 EAPI void
 elm_toolbar_item_tooltip_style_set(Elm_Toolbar_Item *item, const char *style)
 {
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item);
    elm_widget_item_tooltip_style_set(item, style);
 }
 
@@ -1162,6 +1378,7 @@
 EAPI const char *
 elm_toolbar_item_tooltip_style_get(const Elm_Toolbar_Item *item)
 {
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item, NULL);
    return elm_widget_item_tooltip_style_get(item);
 }
 
@@ -1177,6 +1394,7 @@
 EAPI void
 elm_toolbar_item_cursor_set(Elm_Toolbar_Item *item, const char *cursor)
 {
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item);
    elm_widget_item_cursor_set(item, cursor);
 }
 
@@ -1191,6 +1409,7 @@
 EAPI void
 elm_toolbar_item_cursor_unset(Elm_Toolbar_Item *item)
 {
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item);
    elm_widget_item_cursor_unset(item);
 }
 
@@ -1208,6 +1427,7 @@
 EAPI void
 elm_toolbar_item_cursor_style_set(Elm_Toolbar_Item *item, const char *style)
 {
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item);
    elm_widget_item_cursor_style_set(item, style);
 }
 
@@ -1223,6 +1443,7 @@
 EAPI const char *
 elm_toolbar_item_cursor_style_get(const Elm_Toolbar_Item *item)
 {
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item, NULL);
    return elm_widget_item_cursor_style_get(item);
 }
 
@@ -1243,6 +1464,7 @@
 EAPI void
 elm_toolbar_item_cursor_engine_only_set(Elm_Toolbar_Item *item, Eina_Bool engine_only)
 {
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item);
    elm_widget_item_cursor_engine_only_set(item, engine_only);
 }
 
@@ -1259,6 +1481,7 @@
 EAPI Eina_Bool
 elm_toolbar_item_cursor_engine_only_get(const Elm_Toolbar_Item *item)
 {
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item, EINA_FALSE);
    return elm_widget_item_cursor_engine_only_get(item);
 }
 
@@ -1273,201 +1496,16 @@
 EAPI Evas_Object *
 elm_toolbar_item_menu_get(Elm_Toolbar_Item *item)
 {
-   if (!item) return NULL;
+   ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item, NULL);
    Widget_Data *wd = elm_widget_data_get(item->base.widget);
    if (!wd) return NULL;
+   /* FIXME: It's not ok. This function needs to be reviewed. And should
+    * receive a const item */
    elm_toolbar_item_menu_set(item, 1);
    return item->o_menu;
 }
 
 /**
- * Return a list of all toolbar items.
- *
- * @param obj The toolbar object
- *
- * @return An Eina_List* of the toolbar items in @p obj
- *
- * @ingroup Toolbar
- */
-EAPI Eina_List *
-elm_toolbar_item_get_all(Evas_Object *obj)
-{
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return NULL;
-
-   return wd->items;
-}
-
-/**
- * Return the first toolbar item in the list of toolbar items.
- *
- * @param obj The toolbar object
- *
- * @return The first toolbar item, or NULL on failure
- *
- * @ingroup Toolbar
- */
-EAPI Elm_Toolbar_Item *
-elm_toolbar_item_get_first(Evas_Object *obj)
-{
-   Elm_Toolbar_Item *it;
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return NULL;
-   if (!(it = eina_list_data_get(wd->items))) return NULL;
-
-   return it;
-}
-
-/**
- * Return the last toolbar item in the list of toolbar items.
- *
- * @param obj The toolbar object
- *
- * @return The last toolbar item, or NULL on failure
- *
- * @ingroup Toolbar
- */
-EAPI Elm_Toolbar_Item *
-elm_toolbar_item_get_last(Evas_Object *obj)
-{
-   Eina_List *last;
-   Elm_Toolbar_Item *it;
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return NULL;
-   if (!(last = eina_list_last(wd->items))) return NULL;
-   it = eina_list_data_get(last);
-
-   return it;
-}
-
-/**
- * Return the next toolbar item (relative to the currently selected
- * toolbar item) in the list of toolbar items.
- *
- * @param obj The toolbar object
- *
- * @return The next toolbar item, or NULL on failure
- *
- * @ingroup Toolbar
- */
-EAPI Elm_Toolbar_Item *
-elm_toolbar_item_get_next(Evas_Object *obj)
-{
-   Eina_List *l, *l2;
-   Elm_Toolbar_Item *it, *next;
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
-
-   if (!wd) return NULL;
-   EINA_LIST_FOREACH_SAFE(wd->items, l, l2, it)
-     {
-        if (it->selected)
-          {
-	     if (!(next = eina_list_data_get(l2))) return NULL;
-	     return next;
-          }
-     }
-   return NULL;
-}
-
-/**
- * Selects the next non-disabled, non-separator toolbar item in the list
- * of toolbar items.
- *
- * @param obj The toolbar object
- *
- * @return The newly selected toolbar item, or NULL on failure
- *
- * @ingroup Toolbar
- */
-EAPI Elm_Toolbar_Item *
-elm_toolbar_item_select_next(Evas_Object *obj)
-{
-   Eina_List *l, *l2;
-   Elm_Toolbar_Item *it, *next;
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
-
-   if (!wd) return NULL;
-   EINA_LIST_FOREACH(wd->items, l, it)
-     {
-        if (it->selected)
-          {
-             EINA_LIST_FOREACH(l, l2, next)
-               if ((!next->disabled) && (next->separator))
-                 {
-                    _item_select(next);
-                    return next;
-                 }
-          }
-     }
-  return NULL;
-}
-
-/**
- * Selects the first non-disabled, non-separator toolbar item in the list
- * of toolbar items.
- *
- * @param obj The toolbar object
- *
- * @return The newly selected toolbar item, or NULL on failure
- *
- * @ingroup Toolbar
- */
-EAPI Elm_Toolbar_Item *
-elm_toolbar_item_select_first(Evas_Object *obj)
-{
-   Eina_List *l;
-   Elm_Toolbar_Item *it;
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return NULL;
-   EINA_LIST_FOREACH(wd->items, l, it)
-     {
-        if ((!it->disabled) && (!it->separator))
-          {
-             _item_select(it);
-             return it;
-          }
-     }
-
-   return NULL;
-}
-
-/**
- * Selects the last non-disabled, non-separator toolbar item in the list
- * of toolbar items.
- *
- * @param obj The toolbar object
- *
- * @return The newly selected toolbar item, or NULL on failure
- *
- * @ingroup Toolbar
- */
-EAPI Elm_Toolbar_Item *
-elm_toolbar_item_select_last(Evas_Object *obj)
-{
-   Eina_List *l;
-   Elm_Toolbar_Item *it;
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return NULL;
-   EINA_LIST_REVERSE_FOREACH(wd->items, l, it)
-     {
-        if ((!it->disabled) && (!it->separator))
-          {
-             _item_select(it);
-             return it;
-          }
-     }
- 
-   return NULL;
-}
-
-/**
  * Returns a pointer to a toolbar item by its label
  *
  * @param obj The toolbar object
@@ -1479,15 +1517,14 @@
  * @ingroup Toolbar
  */
 EAPI Elm_Toolbar_Item *
-elm_toolbar_item_find_by_label(Evas_Object *obj, const char *label)
+elm_toolbar_item_find_by_label(const Evas_Object *obj, const char *label)
 {
-   Eina_List *l;
    Elm_Toolbar_Item *it;
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
-   
+
    if (!wd) return NULL;
-   EINA_LIST_FOREACH(wd->items, l, it)
+   EINA_INLIST_FOREACH(wd->items, it)
      {
         if (!strcmp(it->label, label)) return it;
      }

Log:
  Add a new shrink mode to elm_toolbar: SHRINK_HIDE
  
  And fix the docs related to shrink mode:
  SHRINK_HIDE -> hide excess items
  SHRINK_NONE -> set toolbar minimun size to fit all the items
  
  
Author:       bdilly
Date:         2010-10-26 03:30:45 -0700 (Tue, 26 Oct 2010)
New Revision: 53895

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/bin/test_toolbar.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_toolbar.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2010-10-26 10:29:24 UTC (rev 53894)
+++ trunk/TMP/st/elementary/src/bin/test.c	2010-10-26 10:30:45 UTC (rev 53895)
@@ -35,6 +35,7 @@
 void test_toolbar(void *data, Evas_Object *obj, void *event_info);
 void test_toolbar2(void *data, Evas_Object *obj, void *event_info);
 void test_toolbar3(void *data, Evas_Object *obj, void *event_info);
+void test_toolbar4(void *data, Evas_Object *obj, void *event_info);
 void test_hoversel(void *data, Evas_Object *obj, void *event_info);
 void test_list(void *data, Evas_Object *obj, void *event_info);
 void test_list_horizontal(void *data, Evas_Object *obj, void *event_info);
@@ -257,6 +258,7 @@
    ADD_TEST("Toolbar", test_toolbar);
    ADD_TEST("Toolbar 2", test_toolbar2);
    ADD_TEST("Toolbar 3", test_toolbar3);
+   ADD_TEST("Toolbar 4", test_toolbar4);
    ADD_TEST("Hoversel", test_hoversel);
    ADD_TEST("List", test_list);
    ADD_TEST("List - Horizontal", test_list_horizontal);

Modified: trunk/TMP/st/elementary/src/bin/test_toolbar.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_toolbar.c	2010-10-26 10:29:24 UTC (rev 53894)
+++ trunk/TMP/st/elementary/src/bin/test_toolbar.c	2010-10-26 10:30:45 UTC (rev 53895)
@@ -370,4 +370,114 @@
    evas_object_resize(win, 320, 300);
    evas_object_show(win);
 }
+
+/* The same test of toolbar, but using hide shrink mode instead of menu */
+void
+test_toolbar4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *win, *bg, *bx, *tb, *ph, *menu;
+   Evas_Object *ph1, *ph2, *ph3, *ph4;
+   Elm_Toolbar_Item *item;
+   Elm_Menu_Item *menu_item;
+   char buf[PATH_MAX];
+
+   win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC);
+   elm_win_title_set(win, "Toolbar 4");
+   elm_win_autodel_set(win, EINA_TRUE);
+
+   bg = elm_bg_add(win);
+   elm_win_resize_object_add(win, bg);
+   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_show(bg);
+
+   bx = elm_box_add(win);
+   elm_win_resize_object_add(win, bx);
+   evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_show(bx);
+
+   tb = elm_toolbar_add(win);
+   elm_toolbar_homogenous_set(tb, 0);
+   elm_toolbar_mode_shrink_set(tb, ELM_TOOLBAR_SHRINK_HIDE);
+   evas_object_size_hint_weight_set(tb, 0.0, 0.0);
+   evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
+
+   ph1 = elm_photo_add(win);
+   ph2 = elm_photo_add(win);
+   ph3 = elm_photo_add(win);
+   ph4 = elm_photo_add(win);
+
+   item = elm_toolbar_item_append(tb, "document-print", "Hello", tb_1, ph1);
+   elm_toolbar_item_disabled_set(item, EINA_TRUE);
+   elm_toolbar_item_priority_set(item, 100);
+
+   item = elm_toolbar_item_append(tb, "folder-new", "World", tb_2, ph1);
+   elm_toolbar_item_priority_set(item, -100);
+
+   item = elm_toolbar_item_append(tb, "object-rotate-right", "H", tb_3, ph4);
+   elm_toolbar_item_priority_set(item, 150);
+
+   item = elm_toolbar_item_append(tb, "mail-send", "Comes", tb_4, ph4);
+   elm_toolbar_item_priority_set(item, 0);
+
+   item = elm_toolbar_item_append(tb, "clock", "Elementary", tb_5, ph4);
+   elm_toolbar_item_priority_set(item, -200);
+
+   item = elm_toolbar_item_append(tb, "refresh", "Menu", NULL, NULL);
+   elm_toolbar_item_menu_set(item, 1);
+   elm_toolbar_item_priority_set(item, -999999);
+   elm_toolbar_menu_parent_set(tb, win);
+   menu = elm_toolbar_item_menu_get(item);
+
+   elm_menu_item_add(menu, NULL, "edit-cut", "Shrink", tb_3, ph4);
+   menu_item = elm_menu_item_add(menu, NULL, "edit-copy", "Mode", tb_4, ph4);
+   elm_menu_item_add(menu, menu_item, "edit-paste", "is set to", tb_4, ph4);
+   elm_menu_item_add(menu, NULL, "edit-delete", "Menu", tb_5, ph4);
+
+   elm_box_pack_end(bx, tb);
+   evas_object_show(tb);
+
+   tb = elm_table_add(win);
+   evas_object_size_hint_weight_set(tb, 0.0, EVAS_HINT_EXPAND);
+   evas_object_size_hint_fill_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+   ph = ph1;
+   elm_photo_size_set(ph, 40);
+   snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", PACKAGE_DATA_DIR);
+   elm_photo_file_set(ph, buf);
+   evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(ph, 0.5, 0.5);
+   elm_table_pack(tb, ph, 0, 0, 1, 1);
+   evas_object_show(ph);
+
+   ph = ph2;
+   elm_photo_size_set(ph, 80);
+   evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(ph, 0.5, 0.5);
+   elm_table_pack(tb, ph, 1, 0, 1, 1);
+   evas_object_show(ph);
+
+   ph = ph3;
+   elm_photo_size_set(ph, 20);
+   snprintf(buf, sizeof(buf), "%s/images/sky_01.jpg", PACKAGE_DATA_DIR);
+   elm_photo_file_set(ph, buf);
+   evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(ph, 0.5, 0.5);
+   elm_table_pack(tb, ph, 0, 1, 1, 1);
+   evas_object_show(ph);
+
+   ph = ph4;
+   elm_photo_size_set(ph, 60);
+   snprintf(buf, sizeof(buf), "%s/images/sky_02.jpg", PACKAGE_DATA_DIR);
+   elm_photo_file_set(ph, buf);
+   evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(ph, 0.5, 0.5);
+   elm_table_pack(tb, ph, 1, 1, 1, 1);
+   evas_object_show(ph);
+
+   elm_box_pack_end(bx, tb);
+   evas_object_show(tb);
+
+   evas_object_resize(win, 320, 300);
+   evas_object_show(win);
+}
 #endif

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-10-26 10:29:24 UTC (rev 53894)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-10-26 10:30:45 UTC (rev 53895)
@@ -245,7 +245,8 @@
 
    typedef enum _Elm_Toolbar_Shrink_Mode
      {
-        ELM_TOOLBAR_SHRINK_NONE,   /**< hide excess items */
+        ELM_TOOLBAR_SHRINK_NONE,   /**< set toolbar minimun size to fit all the items */
+        ELM_TOOLBAR_SHRINK_HIDE,   /**< hide excess items */
         ELM_TOOLBAR_SHRINK_SCROLL, /**< allow accessing excess items through a scroller */
         ELM_TOOLBAR_SHRINK_MENU    /**< inserts a button to pop up a menu with excess items */
      } Elm_Toolbar_Shrink_Mode;

Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_toolbar.c	2010-10-26 10:29:24 UTC (rev 53894)
+++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c	2010-10-26 10:30:45 UTC (rev 53895)
@@ -283,6 +283,7 @@
    switch (wd->shrink_mode)
      {
        case ELM_TOOLBAR_SHRINK_MENU: /* fallthrough */
+       case ELM_TOOLBAR_SHRINK_HIDE: /* fallthrough */
        case ELM_TOOLBAR_SHRINK_SCROLL: minw = w - vw; break;
        case ELM_TOOLBAR_SHRINK_NONE: minw = minw + (w - vw); break;
      }
@@ -326,6 +327,28 @@
 }
 
 static void
+_fix_items_visibility(Widget_Data *wd, Evas_Coord *iw, Evas_Coord vw)
+{
+   Elm_Toolbar_Item *it;
+   Eina_List *sorted = NULL;
+
+   EINA_INLIST_FOREACH(wd->items, it)
+     {
+        sorted = eina_list_sorted_insert(sorted,
+                                         _toolbar_item_prio_compare_cb, it);
+     }
+
+   EINA_LIST_FREE(sorted, it)
+     {
+        Evas_Coord ciw;
+
+        evas_object_geometry_get(it->base.view, NULL, NULL, &ciw, NULL);
+        *iw += ciw;
+        it->prio.visible = (*iw <= vw);
+     }
+}
+
+static void
 _resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Widget_Data *wd = elm_widget_data_get(data);
@@ -344,25 +367,10 @@
    if (wd->shrink_mode == ELM_TOOLBAR_SHRINK_MENU)
      {
         Evas_Coord iw = 0;
-        Eina_List *sorted = NULL;
+        _fix_items_visibility(wd, &iw, vw);
 
-        EINA_INLIST_FOREACH(wd->items, it)
-          {
-             sorted = eina_list_sorted_insert(sorted,
-                                    _toolbar_item_prio_compare_cb, it);
-          }
-
-        EINA_LIST_FREE(sorted, it)
-          {
-             Evas_Coord ciw;
-
-             evas_object_geometry_get(it->base.view, NULL, NULL, &ciw, NULL);
-             iw += ciw;
-             it->prio.visible = (iw <= vw);
-          }
-
-        /* All items are removed from the box object, since removing individual items won't trigger
-           a resize. Items are be readded below. */
+        /* All items are removed from the box object, since removing individual
+         * items won't trigger a resize. Items are be readded below. */
         evas_object_box_remove_all(wd->bx, EINA_FALSE);
         if (iw > vw)
           {
@@ -401,7 +409,8 @@
           }
         else
           {
-             /* All items are visible, show them all (except for the "More" button, of course). */
+             /* All items are visible, show them all (except for the "More"
+              * button, of course). */
              EINA_INLIST_FOREACH(wd->items, it)
                {
                   if (it == wd->more_item)
@@ -414,6 +423,34 @@
                }
           }
      }
+   else if (wd->shrink_mode == ELM_TOOLBAR_SHRINK_HIDE)
+     {
+        Evas_Coord iw = 0;
+        _fix_items_visibility(wd, &iw, vw);
+        evas_object_box_remove_all(wd->bx, EINA_FALSE);
+        if (iw > vw)
+          {
+             EINA_INLIST_FOREACH(wd->items, it)
+               {
+                 if (!it->prio.visible)
+                   evas_object_hide(it->base.view);
+                 else
+                   {
+                      evas_object_box_append(wd->bx, it->base.view);
+                      evas_object_show(it->base.view);
+                   }
+               }
+          }
+        else
+          {
+             /* All items are visible, show them all */
+             EINA_INLIST_FOREACH(wd->items, it)
+               {
+                  evas_object_show(it->base.view);
+                  evas_object_box_append(wd->bx, it->base.view);
+               }
+          }
+     }
    else
      {
         EINA_INLIST_FOREACH(wd->items, it)
@@ -816,10 +853,12 @@
 }
 
 /**
- * Sets the priority of a toolbar item. This is used only when the toolbar expand mode
- * is set to ELM_TOOLBAR_SHRINK_MENU: when space is at a premium, items with low priority
- * will be removed from the toolbar and added to a dynamically-created menu, while items
- * with higher priority will remain on the toolbar, with the same order they were added.
+ * Sets the priority of a toolbar item. This is used only when the toolbar
+ * shrink mode is set to ELM_TOOLBAR_SHRINK_MENU or ELM_TOOLBAR_SHRINK_HIDE:
+ * when space is at a premium, items with low priority will be removed from
+ * the toolbar and added to a dynamically-created menu, while items with
+ * higher priority will remain on the toolbar, with the same order they were
+ * added.
  *
  * @param item The toolbar item.
  * @param priority The item priority. The default is zero.
@@ -1085,11 +1124,13 @@
 }
 
 /**
- * Set the expand state of toolbar @p obj.
+ * Set the shrink state of toolbar @p obj.
  *
  * @param obj The toolbar object
  * @param shrink_mode The toolbar won't scroll if ELM_TOOLBAR_SHRINK_NONE,
- * will scroll if ELM_TOOLBAR_SHRINK_SCROLL, and will create a button to 
+ * but will enforce a minimun size so all the items will fit, won't scroll
+ * and won't show the items that don't fit if ELM_TOOLBAR_SHRINK_HIDE,
+ * will scroll if ELM_TOOLBAR_SHRINK_SCROLL, and will create a button to
  * pop up excess elements with ELM_TOOLBAR_SHRINK_MENU.
  *
  * @ingroup Toolbar
@@ -1121,8 +1162,12 @@
                                                 NULL, NULL);
         elm_toolbar_item_priority_set(wd->more_item, INT_MAX);
      }
+   else if (shrink_mode == ELM_TOOLBAR_SHRINK_HIDE)
+     elm_smart_scroller_policy_set(wd->scr, ELM_SMART_SCROLLER_POLICY_OFF,
+                                   ELM_SMART_SCROLLER_POLICY_OFF);
    else
-     elm_smart_scroller_policy_set(wd->scr, ELM_SMART_SCROLLER_POLICY_AUTO, ELM_SMART_SCROLLER_POLICY_OFF);
+     elm_smart_scroller_policy_set(wd->scr, ELM_SMART_SCROLLER_POLICY_AUTO,
+                                   ELM_SMART_SCROLLER_POLICY_OFF);
    _sizing_eval(obj);
 }

Log:
  elm clean up
  
Author:       bdilly
Date:         2010-11-01 05:44:30 -0700 (Mon, 01 Nov 2010)
New Revision: 54076

Modified:
  trunk/TMP/st/elementary/src/bin/test_launcher.c trunk/TMP/st/elementary/src/lib/elm_config.c trunk/TMP/st/elementary/src/lib/elm_icon.c 

Modified: trunk/TMP/st/elementary/src/bin/test_launcher.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_launcher.c	2010-11-01 11:24:29 UTC (rev 54075)
+++ trunk/TMP/st/elementary/src/bin/test_launcher.c	2010-11-01 12:44:30 UTC (rev 54076)
@@ -553,7 +553,7 @@
 }
 
 static void
-l3_hidden_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+l3_hidden_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *win = data;
    Evas_Object *mb;

Modified: trunk/TMP/st/elementary/src/lib/elm_config.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_config.c	2010-11-01 11:24:29 UTC (rev 54075)
+++ trunk/TMP/st/elementary/src/lib/elm_config.c	2010-11-01 12:44:30 UTC (rev 54076)
@@ -375,7 +375,6 @@
    const Eina_File_Direct_Info *info;
    Eina_List *flist = NULL;
    Eina_Iterator *file_it;
-   struct stat buffer;
    char buf[PATH_MAX];
    const char *dir;
    size_t len;
@@ -454,7 +453,6 @@
 
 #undef S_ISDIR_CASE_DO
 
- it_free:
    eina_iterator_free(file_it);
 
  list_free:

Modified: trunk/TMP/st/elementary/src/lib/elm_icon.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_icon.c	2010-11-01 11:24:29 UTC (rev 54075)
+++ trunk/TMP/st/elementary/src/lib/elm_icon.c	2010-11-01 12:44:30 UTC (rev 54076)
@@ -85,16 +85,16 @@
    edje_object_signal_callback_add(icon_edje, emission, source, func_cb, data);
 }
 
-static void *
-_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source))
+static void
+_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return NULL;
+   if (!wd) return;
    Evas_Object *icon_edje;
    icon_edje = _els_smart_icon_edje_get(wd->img);
-   if (!icon_edje) return NULL;
-   return edje_object_signal_callback_del(icon_edje, emission, source,
-	 func_cb);
+   if (!icon_edje) return;
+   edje_object_signal_callback_del_full(icon_edje, emission, source, func_cb,
+                                        data);
 }
 
 static void

Log:
  Loading icon image from files if absolute path is provided
  
  By: Otavio Pontes <otavio@...>
  
Author:       bdilly
Date:         2010-11-05 11:22:42 -0700 (Fri, 05 Nov 2010)
New Revision: 54188

Modified:
  trunk/TMP/st/elementary/src/bin/test_toolbar.c trunk/TMP/st/elementary/src/lib/elm_icon.c 

Modified: trunk/TMP/st/elementary/src/bin/test_toolbar.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_toolbar.c	2010-11-05 18:21:01 UTC (rev 54187)
+++ trunk/TMP/st/elementary/src/bin/test_toolbar.c	2010-11-05 18:22:42 UTC (rev 54188)
@@ -541,7 +541,7 @@
    elm_toolbar_item_disabled_set(item, EINA_TRUE);
    elm_toolbar_item_priority_set(item, 100);
 
-   item = elm_toolbar_item_append(tb, "folder-new", "World", tb_2, ph1);
+   item = elm_toolbar_item_append(tb, PACKAGE_DATA_DIR"/images/icon_04.png", "World", tb_2, ph1);
    elm_toolbar_item_priority_set(item, -100);
 
    item = elm_toolbar_item_append(tb, "object-rotate-right", "H", tb_3a, ph4);

Modified: trunk/TMP/st/elementary/src/lib/elm_icon.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_icon.c	2010-11-05 18:21:01 UTC (rev 54187)
+++ trunk/TMP/st/elementary/src/lib/elm_icon.c	2010-11-05 18:22:42 UTC (rev 54188)
@@ -43,6 +43,22 @@
 static Eina_Bool _icon_standard_set(Widget_Data *wd, Evas_Object *obj, const char *name);
 static Eina_Bool _icon_freedesktop_set(Widget_Data *wd, Evas_Object *obj, const char *name, int size);
 
+//FIXME: move this code to ecore
+#ifdef _WIN32
+static Eina_Bool
+_path_is_absolute(const char *path)
+{
+   //TODO: Check if this works with all absolute paths in windows
+   return ((isalpha (*path)) && (*(path + 1) == ':') && ((*(path + 2) == '\\') || (*(path + 2) == '/')));
+}
+#else
+static Eina_Bool
+_path_is_absolute(const char *path)
+{
+   return  (*path == '/');
+}
+#endif
+
 static void
 _del_hook(Evas_Object *obj)
 {
@@ -257,6 +273,19 @@
 }
 
 static Eina_Bool
+_icon_file_set(Widget_Data *wd, Evas_Object *obj, const char *path)
+{
+   if (elm_icon_file_set(obj, path, NULL))
+     {
+#ifdef ELM_EFREET
+        wd->freedesktop.use = EINA_FALSE;
+#endif
+        return EINA_TRUE;
+     }
+   return EINA_FALSE;
+}
+
+static Eina_Bool
 _icon_freedesktop_set(Widget_Data *wd, Evas_Object *obj, const char *name, int size)
 {
 #ifdef ELM_EFREET
@@ -294,7 +323,9 @@
 }
 
 /**
- * Set the theme, as standard, for a icon
+ * Set the theme, as standard, for a icon.
+ * If theme was not found and it is the absolute path of an image file, this
+ * image will be used.
  *
  * @param obj The icon object
  * @param name The theme name
@@ -340,6 +371,9 @@
         return EINA_TRUE;
      }
 
+   if (_path_is_absolute(name))
+      return _icon_file_set(wd, obj, name);
+
    /* if that fails, see if icon name is in the format size/name. if so,
       try locating a fallback without the size specification */
    if (!(tmp = strchr(name, '/'))) return EINA_FALSE;

Log:
  Adding a no select mode to toolbar.
  
  In no select mode, toolbar items don't stay selected after click.
  
Author:       bdilly
Date:         2010-11-05 11:23:15 -0700 (Fri, 05 Nov 2010)
New Revision: 54189

Modified:
  trunk/TMP/st/elementary/src/bin/test_toolbar.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_toolbar.c 

Modified: trunk/TMP/st/elementary/src/bin/test_toolbar.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_toolbar.c	2010-11-05 18:22:42 UTC (rev 54188)
+++ trunk/TMP/st/elementary/src/bin/test_toolbar.c	2010-11-05 18:23:15 UTC (rev 54189)
@@ -53,7 +53,6 @@
 tb_4a(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    elm_toolbar_item_state_set(event_info, elm_toolbar_item_state_prev(event_info));
-   elm_toolbar_item_selected_set(event_info, EINA_FALSE);
 }
 
 static void
@@ -531,6 +530,7 @@
    elm_toolbar_mode_shrink_set(tb, ELM_TOOLBAR_SHRINK_MENU);
    evas_object_size_hint_weight_set(tb, 0.0, 0.0);
    evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
+   elm_toolbar_no_select_mode_set(tb, EINA_TRUE);
 
    ph1 = elm_photo_add(win);
    ph2 = elm_photo_add(win);

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-11-05 18:22:42 UTC (rev 54188)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-11-05 18:23:15 UTC (rev 54189)
@@ -1299,6 +1299,8 @@
    EAPI Evas_Object      *elm_toolbar_add(Evas_Object *parent);
    EAPI void              elm_toolbar_icon_size_set(Evas_Object *obj, int icon_size);
    EAPI int               elm_toolbar_icon_size_get(const Evas_Object *obj);
+   EAPI void              elm_toolbar_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select);
+   EAPI Eina_Bool         elm_toolbar_no_select_mode_get(const Evas_Object *obj);
    EAPI Elm_Toolbar_Item *elm_toolbar_item_append(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
    EAPI Elm_Toolbar_Item *elm_toolbar_item_prepend(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
    EAPI Elm_Toolbar_Item *elm_toolbar_item_insert_before(Evas_Object *obj, Elm_Toolbar_Item *before, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);

Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_toolbar.c	2010-11-05 18:22:42 UTC (rev 54188)
+++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c	2010-11-05 18:23:15 UTC (rev 54189)
@@ -20,6 +20,7 @@
    int icon_size;
    double align;
    Eina_Bool homogeneous : 1;
+   Eina_Bool no_select : 1;
 };
 
 struct _Elm_Toolbar_Item
@@ -121,14 +122,17 @@
    if (!wd) return;
    if ((it->selected) || (it->disabled) || (it->separator)) return;
 
-   it2 = elm_toolbar_selected_item_get(it->base.widget);
-   _item_unselect(it2);
+   if (!wd->no_select)
+     {
+        it2 = elm_toolbar_selected_item_get(it->base.widget);
+        _item_unselect(it2);
 
-   it->selected = EINA_TRUE;
-   wd->selected_item = it;
-   edje_object_signal_emit(it->base.view, "elm,state,selected", "elm");
-   elm_widget_signal_emit(it->icon, "elm,state,selected", "elm");
-   _item_show(it);
+        it->selected = EINA_TRUE;
+        wd->selected_item = it;
+        edje_object_signal_emit(it->base.view, "elm,state,selected", "elm");
+        elm_widget_signal_emit(it->icon, "elm,state,selected", "elm");
+        _item_show(it);
+     }
    obj2 = it->base.widget;
    if (it->menu)
      {
@@ -2081,3 +2085,41 @@
    ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
    return elm_widget_item_data_get(item);
 }
+
+/**
+ * Set no select mode.
+ *
+ * This will turn off the ability to select items entirely and they will
+ * neither appear selected nor emit selected signals. The clicked
+ * callback function will still be called.
+ *
+ * @param obj The Toolbar object
+ * @param no_select The no select mode (EINA_TRUE = on, EINA_FALSE = off)
+ *
+ * @ingroup Toolbar
+ */
+EAPI void
+elm_toolbar_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   wd->no_select = no_select;
+}
+
+/**
+ * Gets no select mode.
+ *
+ * @param obj The Toolbar object
+ * @return The no select mode (EINA_TRUE = on, EINA_FALSE = off)
+ *
+ * @ingroup Toolbar
+ */
+EAPI Eina_Bool
+elm_toolbar_no_select_mode_get(const Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return EINA_FALSE;
+   return wd->no_select;
+}

Log:
  Fix flippicker item selection
  
Author:       bdilly
Date:         2010-11-09 12:26:22 -0800 (Tue, 09 Nov 2010)
New Revision: 54376

Modified:
  trunk/TMP/st/elementary/src/bin/test_flippicker.c trunk/TMP/st/elementary/src/lib/elm_flippicker.c 

Modified: trunk/TMP/st/elementary/src/bin/test_flippicker.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_flippicker.c	2010-11-09 20:25:57 UTC (rev 54375)
+++ trunk/TMP/st/elementary/src/bin/test_flippicker.c	2010-11-09 20:26:22 UTC (rev 54376)
@@ -14,11 +14,13 @@
 }
 
 void
-_first_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_third_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Elm_Flippicker_Item *it;
    Evas_Object *fp = data;
    it = elm_flippicker_first_item_get(fp);
+   it = elm_flippicker_item_next(it);
+   it = elm_flippicker_item_next(it);
    elm_flippicker_item_selected_set(it);
 }
 
@@ -88,8 +90,8 @@
    evas_object_show(fp);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Select 1990");
-   evas_object_smart_callback_add(bt, "clicked", _first_cb, fp);
+   elm_button_label_set(bt, "Select 1992");
+   evas_object_smart_callback_add(bt, "clicked", _third_cb, fp);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 

Modified: trunk/TMP/st/elementary/src/lib/elm_flippicker.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_flippicker.c	2010-11-09 20:25:57 UTC (rev 54375)
+++ trunk/TMP/st/elementary/src/lib/elm_flippicker.c	2010-11-09 20:26:22 UTC (rev 54376)
@@ -389,9 +389,20 @@
 }
 
 static void
+_send_msg(Widget_Data *wd, int flipside, char *label)
+{
+   Edje_Message_String msg;
+
+   msg.str = label;
+   edje_object_message_send(wd->base, EDJE_MESSAGE_STRING, flipside, &msg);
+   edje_object_message_signal_process(wd->base);
+
+   _changed(wd);
+}
+
+static void
 _flip_up(Widget_Data *wd)
 {
-   Edje_Message_String msg;
    Elm_Flippicker_Item *item;
 
    if (!wd->current)
@@ -409,12 +420,7 @@
    if (!item)
      return;
 
-   msg.str = (char *)item->label;
-   edje_object_message_send(wd->base, EDJE_MESSAGE_STRING, MSG_FLIP_UP, &msg);
-   edje_object_message_signal_process(wd->base);
-
-   _changed(wd);
-   return;
+   _send_msg(wd, MSG_FLIP_UP, (char *)item->label);
 }
 
 static Eina_Bool
@@ -461,7 +467,6 @@
 static void
 _flip_down(Widget_Data *wd)
 {
-   Edje_Message_String msg;
    Elm_Flippicker_Item *item;
 
    if (!wd->current)
@@ -478,13 +483,7 @@
    if (!item)
      return;
 
-   msg.str = (char *)item->label;
-
-   edje_object_message_send(wd->base, EDJE_MESSAGE_STRING, MSG_FLIP_DOWN, &msg);
-   edje_object_message_signal_process(wd->base);
-
-   _changed(wd);
-   return;
+   _send_msg(wd, MSG_FLIP_DOWN, (char *)item->label);
 }
 
 static Eina_Bool
@@ -864,7 +863,8 @@
 {
    ELM_FLIPPICKER_ITEM_CHECK_DELETED_RETURN(item);
 
-   Elm_Flippicker_Item *_item;
+   Elm_Flippicker_Item *_item, *cur;
+   int flipside = MSG_FLIP_UP;
    Widget_Data *wd;
    Eina_List *l;
 
@@ -872,14 +872,21 @@
    if (!wd)
      return;
 
+   cur = DATA_GET(wd->current);
+   if (cur == item)
+     return;
+
    _flippicker_walk(wd);
 
    EINA_LIST_FOREACH(wd->items, l, _item)
      {
+	if (_item == cur)
+          flipside = MSG_FLIP_DOWN;
+
 	if (_item == item)
 	  {
 	     wd->current = l;
-	     _update_view(item->base.widget);
+             _send_msg(wd, flipside, (char *)item->label);
 	     break;
 	  }
      }

Log:
  Change flippicker items functions names
  
  elm_flippicker_item_prev/next -> elm_flippicker_item_prev_get/next_get
  elm_flippicker_item_selected_set(it) ->
     elm_flippicker_item_selected_set(it, bool selected)
  
  Added bool elm_flippicker_item_selected_get(it)
  
  
Author:       bdilly
Date:         2010-11-09 12:26:47 -0800 (Tue, 09 Nov 2010)
New Revision: 54377

Modified:
  trunk/TMP/st/elementary/src/bin/test_flippicker.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_flippicker.c 

Modified: trunk/TMP/st/elementary/src/bin/test_flippicker.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_flippicker.c	2010-11-09 20:26:22 UTC (rev 54376)
+++ trunk/TMP/st/elementary/src/bin/test_flippicker.c	2010-11-09 20:26:47 UTC (rev 54377)
@@ -14,14 +14,23 @@
 }
 
 void
+_unsel_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Elm_Flippicker_Item *it;
+   Evas_Object *fp = data;
+   it = elm_flippicker_selected_item_get(fp);
+   elm_flippicker_item_selected_set(it, EINA_FALSE);
+}
+
+void
 _third_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Elm_Flippicker_Item *it;
    Evas_Object *fp = data;
    it = elm_flippicker_first_item_get(fp);
-   it = elm_flippicker_item_next(it);
-   it = elm_flippicker_item_next(it);
-   elm_flippicker_item_selected_set(it);
+   it = elm_flippicker_item_next_get(it);
+   it = elm_flippicker_item_next_get(it);
+   elm_flippicker_item_selected_set(it, EINA_TRUE);
 }
 
 void
@@ -95,6 +104,12 @@
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "Unselect year");
+   evas_object_smart_callback_add(bt, "clicked", _unsel_cb, fp);
+   elm_box_pack_end(bx, bt);
+   evas_object_show(bt);
+
    evas_object_show(win);
 }
 #endif

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-11-09 20:26:22 UTC (rev 54376)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-11-09 20:26:47 UTC (rev 54377)
@@ -2139,12 +2139,13 @@
    EAPI Elm_Flippicker_Item       *elm_flippicker_first_item_get(const Evas_Object *obj);
    EAPI Elm_Flippicker_Item       *elm_flippicker_last_item_get(const Evas_Object *obj);
    EAPI Elm_Flippicker_Item       *elm_flippicker_selected_item_get(const Evas_Object *obj);
-   EAPI void                       elm_flippicker_item_selected_set(Elm_Flippicker_Item *item);
+   EAPI void                       elm_flippicker_item_selected_set(Elm_Flippicker_Item *item, Eina_Bool selected);
+   EAPI Eina_Bool                  elm_flippicker_item_selected_get(const Elm_Flippicker_Item *item);
    EAPI void                       elm_flippicker_item_del(Elm_Flippicker_Item *item);
    EAPI const char                *elm_flippicker_item_label_get(const Elm_Flippicker_Item *item);
    EAPI void                       elm_flippicker_item_label_set(Elm_Flippicker_Item *item, const char *label);
-   EAPI Elm_Flippicker_Item       *elm_flippicker_item_prev(Elm_Flippicker_Item *item);
-   EAPI Elm_Flippicker_Item       *elm_flippicker_item_next(Elm_Flippicker_Item *item);
+   EAPI Elm_Flippicker_Item       *elm_flippicker_item_prev_get(Elm_Flippicker_Item *item);
+   EAPI Elm_Flippicker_Item       *elm_flippicker_item_next_get(Elm_Flippicker_Item *item);
    EAPI void                       elm_flippicker_interval_set(Evas_Object *obj, double interval);
    EAPI double                     elm_flippicker_interval_get(const Evas_Object *obj);
    /* smart callbacks called:

Modified: trunk/TMP/st/elementary/src/lib/elm_flippicker.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_flippicker.c	2010-11-09 20:26:22 UTC (rev 54376)
+++ trunk/TMP/st/elementary/src/lib/elm_flippicker.c	2010-11-09 20:26:47 UTC (rev 54377)
@@ -852,14 +852,20 @@
 }
 
 /**
- * Set the selected state of a flippicker item.
+ * Set the selected state of an item
  *
+ * This sets the selected state (EINA_TRUE selected, EINA_FALSE not selected)
+ * of the given item @p item.
+ * If a new item is selected the previosly selected will be unselected.
+ * If the item @p item is unselected, the first item will be selected.
+ *
  * @param item The item
+ * @param selected The selected state
  *
  * @ingroup Flippicker
  */
 EAPI void
-elm_flippicker_item_selected_set(Elm_Flippicker_Item *item)
+elm_flippicker_item_selected_set(Elm_Flippicker_Item *item, Eina_Bool selected)
 {
    ELM_FLIPPICKER_ITEM_CHECK_DELETED_RETURN(item);
 
@@ -873,11 +879,26 @@
      return;
 
    cur = DATA_GET(wd->current);
-   if (cur == item)
+   if ((selected) && (cur == item))
      return;
 
    _flippicker_walk(wd);
 
+   if ((!selected) && (cur == item))
+     {
+        EINA_LIST_FOREACH(wd->items, l, _item)
+          {
+             if (!_item->deleted)
+               {
+                  wd->current = l;
+                  _send_msg(wd, MSG_FLIP_UP, (char *)_item->label);
+                  break;
+               }
+          }
+        _flippicker_unwalk(wd);
+        return;
+     }
+
    EINA_LIST_FOREACH(wd->items, l, _item)
      {
 	if (_item == cur)
@@ -892,8 +913,25 @@
      }
 
    _flippicker_unwalk(wd);
+}
 
-   return;
+/*
+ * Get the selected state of @p item.
+ *
+ * @param item The flippicker item
+ * @return If true, the item is selected
+ *
+ * @ingroup Flippicker
+ */
+EAPI Eina_Bool
+elm_flippicker_item_selected_get(const Elm_Flippicker_Item *item)
+{
+   ELM_FLIPPICKER_ITEM_CHECK_DELETED_RETURN(item, EINA_FALSE);
+   Widget_Data *wd;
+
+   wd = elm_widget_data_get(item->base.widget);
+   if (!wd) return EINA_FALSE;
+   return (eina_list_data_get(wd->current) == item);
 }
 
 /**
@@ -1009,7 +1047,7 @@
  * @ingroup Flippicker
  */
 EAPI Elm_Flippicker_Item *
-elm_flippicker_item_prev(Elm_Flippicker_Item *item)
+elm_flippicker_item_prev_get(Elm_Flippicker_Item *item)
 {
    ELM_FLIPPICKER_ITEM_CHECK_DELETED_RETURN(item, NULL);
 
@@ -1042,7 +1080,7 @@
  * @ingroup Flippicker
  */
 EAPI Elm_Flippicker_Item *
-elm_flippicker_item_next(Elm_Flippicker_Item *item)
+elm_flippicker_item_next_get(Elm_Flippicker_Item *item)
 {
    ELM_FLIPPICKER_ITEM_CHECK_DELETED_RETURN(item, NULL);

Log:
  Change diskpicker items functions names
  
  elm_diskpicker_item_prev/next ->
  elm_diskpicker_item_prev_get/next_get
  
  elm_diskpicker_item_selected_set(it) ->
  elm_diskpicker_item_selected_set(it, bool selected)
  
  elm_diskpicker_item_selected_get(obj) ->
  elm_diskpicker_selected_item_get(obj)
  
  Added bool elm_diskpicker_item_selected_get(it)
        item elm_diskpicker_first_item_get
        item elm_diskpicker_last_item_get
  
  
Author:       bdilly
Date:         2010-11-09 12:27:32 -0800 (Tue, 09 Nov 2010)
New Revision: 54379

Modified:
  trunk/TMP/st/elementary/src/bin/test_diskpicker.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_diskpicker.c 

Modified: trunk/TMP/st/elementary/src/bin/test_diskpicker.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_diskpicker.c	2010-11-09 20:27:07 UTC (rev 54378)
+++ trunk/TMP/st/elementary/src/bin/test_diskpicker.c	2010-11-09 20:27:32 UTC (rev 54379)
@@ -15,8 +15,8 @@
 _disk_next(void *data __UNUSED__, Evas_Object * obj __UNUSED__, void *event_info)
 {
    Elm_Diskpicker_Item *next, *prev, *it = event_info;
-   prev = elm_diskpicker_item_prev(it);
-   next = elm_diskpicker_item_next(it);
+   prev = elm_diskpicker_item_prev_get(it);
+   next = elm_diskpicker_item_next_get(it);
    printf("Prev: %s, Next: %s\n", elm_diskpicker_item_label_get(prev),
           elm_diskpicker_item_label_get(next));
 }
@@ -49,7 +49,7 @@
    elm_diskpicker_item_append(di, "November", NULL, NULL, NULL);
    elm_diskpicker_item_append(di, "December", NULL, NULL, NULL);
 
-   elm_diskpicker_item_selected_set(it);
+   elm_diskpicker_item_selected_set(it, EINA_TRUE);
    elm_diskpicker_round_set(di, round);
 
    return di;
@@ -59,6 +59,7 @@
 test_diskpicker(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *win, *bg, *bx, *disk, *ic;
+   Elm_Diskpicker_Item *it;
    char buf[PATH_MAX];
 
    win = elm_win_add(NULL, "diskpicker", ELM_WIN_BASIC);
@@ -83,6 +84,8 @@
    elm_box_pack_end(bx, disk);
    evas_object_show(disk);
    evas_object_smart_callback_add(disk, "selected", _print_disk_info_cb, NULL);
+   it = elm_diskpicker_selected_item_get(disk);
+   elm_diskpicker_item_selected_set(it, EINA_FALSE);
 
    disk = _disk_create(win, EINA_FALSE);
    evas_object_size_hint_weight_set(disk, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -90,6 +93,9 @@
    elm_box_pack_end(bx, disk);
    evas_object_show(disk);
    evas_object_smart_callback_add(disk, "selected", _print_disk_info_cb, NULL);
+   it = elm_diskpicker_first_item_get(disk);
+   it = elm_diskpicker_item_next_get(it);
+   elm_diskpicker_item_selected_set(it, EINA_TRUE);
 
    disk = _disk_create(win, EINA_FALSE);
    evas_object_size_hint_weight_set(disk, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-11-09 20:27:07 UTC (rev 54378)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-11-09 20:27:32 UTC (rev 54379)
@@ -2245,17 +2245,20 @@
    EAPI void                  elm_diskpicker_clear(Evas_Object *obj);
    EAPI const Eina_List      *elm_diskpicker_items_get(const Evas_Object *obj);
    EAPI Elm_Diskpicker_Item  *elm_diskpicker_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Smart_Cb func, const void *data);
-   EAPI void	              elm_diskpicker_item_del(Elm_Diskpicker_Item *it);
+   EAPI void	              elm_diskpicker_item_del(Elm_Diskpicker_Item *item);
    EAPI void                  elm_diskpicker_item_del_cb_set(Elm_Diskpicker_Item *item, Evas_Smart_Cb func);
    EAPI void                 *elm_diskpicker_item_data_get(const Elm_Diskpicker_Item *item);
    EAPI Evas_Object          *elm_diskpicker_item_icon_get(const Elm_Diskpicker_Item *item);
    EAPI void                  elm_diskpicker_item_icon_set(Elm_Diskpicker_Item *item, Evas_Object *icon);
-   EAPI const char           *elm_diskpicker_item_label_get(const Elm_Diskpicker_Item *it);
-   EAPI void                  elm_diskpicker_item_label_set(Elm_Diskpicker_Item *it, const char *label);
-   EAPI Elm_Diskpicker_Item  *elm_diskpicker_item_selected_get(const Evas_Object *obj);
-   EAPI void                  elm_diskpicker_item_selected_set(Elm_Diskpicker_Item *it);
-   EAPI Elm_Diskpicker_Item  *elm_diskpicker_item_prev(const Elm_Diskpicker_Item *it);
-   EAPI Elm_Diskpicker_Item  *elm_diskpicker_item_next(const Elm_Diskpicker_Item *it);
+   EAPI const char           *elm_diskpicker_item_label_get(const Elm_Diskpicker_Item *item);
+   EAPI void                  elm_diskpicker_item_label_set(Elm_Diskpicker_Item *item, const char *label);
+   EAPI Elm_Diskpicker_Item  *elm_diskpicker_selected_item_get(const Evas_Object *obj);
+   EAPI void                  elm_diskpicker_item_selected_set(Elm_Diskpicker_Item *item, Eina_Bool selected);
+   EAPI Eina_Bool             elm_diskpicker_item_selected_get(const Elm_Diskpicker_Item *item);
+   EAPI Elm_Diskpicker_Item  *elm_diskpicker_first_item_get(const Evas_Object *obj);
+   EAPI Elm_Diskpicker_Item  *elm_diskpicker_last_item_get(const Evas_Object *obj);
+   EAPI Elm_Diskpicker_Item  *elm_diskpicker_item_prev_get(const Elm_Diskpicker_Item *item);
+   EAPI Elm_Diskpicker_Item  *elm_diskpicker_item_next_get(const Elm_Diskpicker_Item *item);
    EAPI void                  elm_diskpicker_item_tooltip_text_set(Elm_Diskpicker_Item *item, const char *text);
    EAPI void                  elm_diskpicker_item_tooltip_content_cb_set(Elm_Diskpicker_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
    EAPI void                  elm_diskpicker_item_tooltip_unset(Elm_Diskpicker_Item *item);

Modified: trunk/TMP/st/elementary/src/lib/elm_diskpicker.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_diskpicker.c	2010-11-09 20:27:07 UTC (rev 54378)
+++ trunk/TMP/st/elementary/src/lib/elm_diskpicker.c	2010-11-09 20:27:32 UTC (rev 54379)
@@ -1119,7 +1119,7 @@
  * @ingroup Diskpicker
  */
 EAPI Elm_Diskpicker_Item *
-elm_diskpicker_item_selected_get(const Evas_Object *obj)
+elm_diskpicker_selected_item_get(const Evas_Object *obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -1128,25 +1128,57 @@
 }
 
 /**
- * Set the selected item
+ * Set the selected state of an item
  *
- * @param it The item of diskpicker
+ * This sets the selected state (EINA_TRUE selected, EINA_FALSE not selected)
+ * of the given item @p it.
+ * If a new item is selected the previosly selected will be unselected.
+ * If the item @p it is unselected, the first item will be selected.
  *
+ * @param it The diskpicker item
+ * @param selected The selected state
+ *
  * @ingroup Diskpicker
  */
 EAPI void
-elm_diskpicker_item_selected_set(Elm_Diskpicker_Item * it)
+elm_diskpicker_item_selected_set(Elm_Diskpicker_Item *it, Eina_Bool selected)
 {
    ELM_DISKPICKER_ITEM_CHECK_OR_RETURN(it);
    Widget_Data *wd;
    wd = elm_widget_data_get(it->base.widget);
    if (!wd) return;
 
-   wd->selected_item = it;
+   if ((wd->selected_item == it) && (selected))
+     return;
+
+   if ((wd->selected_item == it) && (!selected))
+     wd->selected_item = eina_list_data_get(wd->items);
+   else
+     wd->selected_item = it;
+
    if (!wd->idler)
      ecore_idler_add(_move_scroller, it->base.widget);
 }
 
+/*
+ * Get the selected state of @p item.
+ *
+ * @param it The diskpicker item
+ * @return If true, the item is selected
+ *
+ * @ingroup Diskpicker
+ */
+EAPI Eina_Bool
+elm_diskpicker_item_selected_get(const Elm_Diskpicker_Item *it)
+{
+   ELM_DISKPICKER_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
+   Widget_Data *wd;
+
+   wd = elm_widget_data_get(it->base.widget);
+   if (!wd) return EINA_FALSE;
+   return (wd->selected_item == it);
+}
+
 /**
  * Set the function called when a diskpicker item is freed.
  *
@@ -1225,7 +1257,7 @@
  * @ingroup Diskpicker
  */
 EAPI Elm_Diskpicker_Item *
-elm_diskpicker_item_prev(const Elm_Diskpicker_Item *it)
+elm_diskpicker_item_prev_get(const Elm_Diskpicker_Item *it)
 {
    ELM_DISKPICKER_ITEM_CHECK_OR_RETURN(it, NULL);
    if (it->node->prev) return it->node->prev->data;
@@ -1241,7 +1273,7 @@
  * @ingroup Diskpicker
  */
 EAPI Elm_Diskpicker_Item *
-elm_diskpicker_item_next(const Elm_Diskpicker_Item *it)
+elm_diskpicker_item_next_get(const Elm_Diskpicker_Item *it)
 {
    ELM_DISKPICKER_ITEM_CHECK_OR_RETURN(it, NULL);
    if (it->node->next) return it->node->next->data;
@@ -1249,6 +1281,48 @@
 }
 
 /**
+ * Get the first item in the diskpicker
+ *
+ * @param obj The diskpicker object
+ * @return The first item, or NULL if none
+ *
+ * @ingroup Diskpicker
+ */
+EAPI Elm_Diskpicker_Item *
+elm_diskpicker_first_item_get(const Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd;
+
+   wd = elm_widget_data_get(obj);
+   if (!wd || !wd->items)
+     return NULL;
+
+   return eina_list_data_get(wd->items);
+}
+
+/**
+ * Get the last item in the diskpicker
+ *
+ * @param obj The diskpicker object
+ * @return The last item, or NULL if none
+ *
+ * @ingroup Diskpicker
+ */
+EAPI Elm_Diskpicker_Item *
+elm_diskpicker_last_item_get(const Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+
+   Widget_Data *wd;
+   wd = elm_widget_data_get(obj);
+   if (!wd || !wd->items)
+     return NULL;
+
+   return eina_list_data_get(eina_list_last(wd->items));
+}
+
+/**
  * Set the text to be shown in the diskpicker item.
  *
  * @param item Target item

Log:
  This small patch allows to get a smart callback when the scrollers in an
  elm_list or in an elm_genlist fire the edge,{top,bottom,left,right}
  signals, backporting them to the list object.
  
  The new smart callbacks called are:
   ?\194?\183 "scroll,edge,top" - the list is scrolled until the top edge
   ?\194?\183 "scroll,edge,bottom" - the list is scrolled until the bottom edge
   ?\194?\183 "scroll,edge,left" - the list is scrolled until the left edge
   ?\194?\183 "scroll,edge,right" - the list is scrolled until the right edge
  
  By: Marco Trevisan (Trevi?\195?\177o) <mail@...>
  
  
Author:       bdilly
Date:         2010-11-09 18:48:59 -0800 (Tue, 09 Nov 2010)
New Revision: 54393

Modified:
  trunk/TMP/st/elementary/src/bin/test_genlist.c trunk/TMP/st/elementary/src/bin/test_list.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_genlist.c trunk/TMP/st/elementary/src/lib/elm_list.c 

Modified: trunk/TMP/st/elementary/src/bin/test_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_genlist.c	2010-11-10 02:23:14 UTC (rev 54392)
+++ trunk/TMP/st/elementary/src/bin/test_genlist.c	2010-11-10 02:48:59 UTC (rev 54393)
@@ -877,6 +877,30 @@
 }
 
 static void
+scroll_top(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   printf("Top edge!\n");
+}
+
+static void
+scroll_bottom(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   printf("Bottom edge!\n");
+}
+
+static void
+scroll_left(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   printf("Left edge!\n");
+}
+
+static void
+scroll_right(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   printf("Right edge!\n");
+}
+
+static void
 item_drag(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    printf("drag\n");
@@ -945,6 +969,10 @@
    evas_object_smart_callback_add(gl, "drag,start,down", item_drag_down, NULL);
    evas_object_smart_callback_add(gl, "drag,start,left", item_drag_left, NULL);
    evas_object_smart_callback_add(gl, "drag,start,right", item_drag_right, NULL);
+   evas_object_smart_callback_add(gl, "scroll,edge,top", scroll_top, NULL);
+   evas_object_smart_callback_add(gl, "scroll,edge,bottom", scroll_bottom, NULL);
+   evas_object_smart_callback_add(gl, "scroll,edge,left", scroll_left, NULL);
+   evas_object_smart_callback_add(gl, "scroll,edge,right", scroll_right, NULL);
    evas_object_smart_callback_add(gl, "drag", item_drag, NULL);
    evas_object_smart_callback_add(gl, "drag,stop", item_drag_stop, NULL);
    evas_object_smart_callback_add(gl, "longpressed", item_longpress, NULL);

Modified: trunk/TMP/st/elementary/src/bin/test_list.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_list.c	2010-11-10 02:23:14 UTC (rev 54392)
+++ trunk/TMP/st/elementary/src/bin/test_list.c	2010-11-10 02:48:59 UTC (rev 54393)
@@ -9,6 +9,30 @@
    elm_list_item_show(data);
 }
 
+static void
+scroll_top(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   printf("Top edge!\n");
+}
+
+static void
+scroll_bottom(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   printf("Bottom edge!\n");
+}
+
+static void
+scroll_left(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   printf("Left edge!\n");
+}
+
+static void
+scroll_right(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   printf("Right edge!\n");
+}
+
 void
 test_list(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
@@ -147,6 +171,11 @@
    
    evas_object_resize(win, 320, 300);
    evas_object_show(win);
+
+   evas_object_smart_callback_add(li, "scroll,edge,top", scroll_top, NULL);
+   evas_object_smart_callback_add(li, "scroll,edge,bottom", scroll_bottom, NULL);
+   evas_object_smart_callback_add(li, "scroll,edge,left", scroll_left, NULL);
+   evas_object_smart_callback_add(li, "scroll,edge,right", scroll_right, NULL);
 }
 
 void

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-11-10 02:23:14 UTC (rev 54392)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-11-10 02:48:59 UTC (rev 54393)
@@ -1506,6 +1506,10 @@
     * "selected" - when the user selected an item
     * "unselected" - when the user selected an item
     * "longpressed" - an item in the hoversel list is long-pressed
+    * "scroll,edge,top" - the list is scrolled until the top edge
+    * "scroll,edge,bottom" - the list is scrolled until the bottom edge
+    * "scroll,edge,left" - the list is scrolled until the left edge
+    * "scroll,edge,right" - the list is scrolled until the right edge
     */
 
    /* slider */

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-11-10 02:23:14 UTC (rev 54392)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-11-10 02:48:59 UTC (rev 54393)
@@ -2022,6 +2022,34 @@
    elm_smart_scroller_freeze_set(wd->scr, 0);
 }
 
+static void
+_scroll_edge_left(void *data, Evas_Object *scr __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *obj = data;
+   evas_object_smart_callback_call(obj, "scroll,edge,left", NULL);
+}
+
+static void
+_scroll_edge_right(void *data, Evas_Object *scr __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *obj = data;
+   evas_object_smart_callback_call(obj, "scroll,edge,right", NULL);
+}
+
+static void
+_scroll_edge_top(void *data, Evas_Object *scr __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *obj = data;
+   evas_object_smart_callback_call(obj, "scroll,edge,top", NULL);
+}
+
+static void
+_scroll_edge_bottom(void *data, Evas_Object *scr __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *obj = data;
+   evas_object_smart_callback_call(obj, "scroll,edge,bottom", NULL);
+}
+
 /**
  * Add a new Genlist object
  *
@@ -2076,6 +2104,11 @@
    elm_smart_scroller_bounce_allow_set(wd->scr, EINA_FALSE,
                                        _elm_config->thumbscroll_bounce_enable);
 
+   evas_object_smart_callback_add(wd->scr, "edge,left", _scroll_edge_left, obj);
+   evas_object_smart_callback_add(wd->scr, "edge,right", _scroll_edge_right, obj);
+   evas_object_smart_callback_add(wd->scr, "edge,top", _scroll_edge_top, obj);
+   evas_object_smart_callback_add(wd->scr, "edge,bottom", _scroll_edge_bottom, obj);
+
    wd->obj = obj;
    wd->mode = ELM_LIST_SCROLL;
    wd->max_items_per_block = 32;

Modified: trunk/TMP/st/elementary/src/lib/elm_list.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_list.c	2010-11-10 02:23:14 UTC (rev 54392)
+++ trunk/TMP/st/elementary/src/lib/elm_list.c	2010-11-10 02:48:59 UTC (rev 54393)
@@ -70,6 +70,10 @@
 static void _mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info);
 static void _mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info);
 static void _mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event_info);
+static void _scroll_edge_left(void *data, Evas_Object *scr, void *event_info);
+static void _scroll_edge_right(void *data, Evas_Object *scr, void *event_info);
+static void _scroll_edge_top(void *data, Evas_Object *scr, void *event_info);
+static void _scroll_edge_bottom(void *data, Evas_Object *scr, void *event_info);
 static Eina_Bool _item_multi_select_up(Widget_Data *wd);
 static Eina_Bool _item_multi_select_down(Widget_Data *wd);
 static Eina_Bool _item_single_select_up(Widget_Data *wd);
@@ -677,6 +681,34 @@
      }
 }
 
+static void
+_scroll_edge_left(void *data, Evas_Object *scr __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *obj = data;
+   evas_object_smart_callback_call(obj, "scroll,edge,left", NULL);
+}
+
+static void
+_scroll_edge_right(void *data, Evas_Object *scr __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *obj = data;
+   evas_object_smart_callback_call(obj, "scroll,edge,right", NULL);
+}
+
+static void
+_scroll_edge_top(void *data, Evas_Object *scr __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *obj = data;
+   evas_object_smart_callback_call(obj, "scroll,edge,top", NULL);
+}
+
+static void
+_scroll_edge_bottom(void *data, Evas_Object *scr __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *obj = data;
+   evas_object_smart_callback_call(obj, "scroll,edge,bottom", NULL);
+}
+
 static Eina_Bool
 _long_press(void *data)
 {
@@ -1160,6 +1192,11 @@
 
    wd->mode = ELM_LIST_SCROLL;
 
+   evas_object_smart_callback_add(wd->scr, "edge,left", _scroll_edge_left, obj);
+   evas_object_smart_callback_add(wd->scr, "edge,right", _scroll_edge_right, obj);
+   evas_object_smart_callback_add(wd->scr, "edge,top", _scroll_edge_top, obj);
+   evas_object_smart_callback_add(wd->scr, "edge,bottom", _scroll_edge_bottom, obj);
+
    evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
    evas_object_smart_callback_add(obj, "scroll-hold-on", _hold_on, obj);
    evas_object_smart_callback_add(obj, "scroll-hold-off", _hold_off, obj);

Log:
  Add elm_genlist_item_item_class_update
  
  1. elm_genlist_item_item_class_update() API
  It is required to change an item's item class on run-time.
  Applications want to change a certain item's style and callbacks
  dynamically.
  This looks ok because changing one item's style does not affect performance,
  And this API uses elm_genlist_item_update internally.
  API name follows elementary naming conventions.
  I've also added test code to elementary_test, Genlist 7.
  
  2. constant to macro.
  I replaced 2 constants for max_item_per_block and longpress_timeout to
  macros.
  This could be used in other places of the code.
  
  3. duplicated assignment.
  In elm_genlist_item_append, it->before = 0 is written in if and else.
  I put this statement out of if().
  
  4. fix doxygen typo
  I fixed elm_genlist_compress_mode_set doxygen.
  
  By: Daniel Juyung Seo <juyung.seo@...>
  
  
Author:       bdilly
Date:         2010-11-17 09:15:28 -0800 (Wed, 17 Nov 2010)
New Revision: 54639

Modified:
  trunk/TMP/st/elementary/src/bin/test_genlist.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_genlist.c 

Modified: trunk/TMP/st/elementary/src/bin/test_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_genlist.c	2010-11-17 17:12:43 UTC (rev 54638)
+++ trunk/TMP/st/elementary/src/bin/test_genlist.c	2010-11-17 17:15:28 UTC (rev 54639)
@@ -1195,7 +1195,16 @@
   Evas_Object *win, *pager;
 };
 
+static Elm_Genlist_Item_Class itc7;
 static void
+gl_sel7(void *data, Evas_Object *obj, void *event_info)
+{
+   if (!event_info) return;
+   elm_genlist_item_item_class_update(event_info, &itc7);
+   printf("sel item data [%p] on genlist obj [%p], item pointer [%p], new item style [%s] \n", data, obj, event_info, itc7.item_style);
+}
+
+static void
 test_genlist7_back_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
     struct genlist7_data *info = data;
@@ -1277,20 +1286,26 @@
    itc2.func.state_get = gl2_state_get;
    itc2.func.del       = gl2_del;
 
+   itc7.item_style     = "double_label";
+   itc7.func.label_get = gl5_label_get;
+   itc7.func.icon_get  = gl5_icon_get;
+   itc7.func.state_get = gl5_state_get;
+   itc7.func.del       = gl5_del;
+
    tit[0].mode = 0;
    tit[0].item = elm_genlist_item_append(gl, &itc2,
 					 &(tit[0])/* item data */, NULL/* parent */,
-                                         ELM_GENLIST_ITEM_NONE, gl_sel/* func */,
+                                         ELM_GENLIST_ITEM_NONE, gl_sel7/* func */,
 					 NULL/* func data */);
    tit[1].mode = 1;
    tit[1].item = elm_genlist_item_append(gl, &itc2,
 					 &(tit[1])/* item data */, NULL/* parent */,
-                                         ELM_GENLIST_ITEM_NONE, gl_sel/* func */,
+                                         ELM_GENLIST_ITEM_NONE, gl_sel7/* func */,
 					 NULL/* func data */);
    tit[2].mode = 2;
    tit[2].item = elm_genlist_item_append(gl, &itc2,
         				 &(tit[2])/* item data */, NULL/* parent */,
-                                         ELM_GENLIST_ITEM_NONE, gl_sel/* func */,
+                                         ELM_GENLIST_ITEM_NONE, gl_sel7/* func */,
         				 NULL/* func data */);
 
    evas_object_resize(win, 320, 320);

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-11-17 17:12:43 UTC (rev 54638)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-11-17 17:15:28 UTC (rev 54639)
@@ -1665,6 +1665,7 @@
    EAPI void              elm_genlist_item_icons_orphan(Elm_Genlist_Item *it);
    EAPI const Evas_Object *elm_genlist_item_object_get(const Elm_Genlist_Item *it);
    EAPI void              elm_genlist_item_update(Elm_Genlist_Item *item);
+   EAPI void              elm_genlist_item_item_class_update(Elm_Genlist_Item *it, const Elm_Genlist_Item_Class *itc);
    EAPI void              elm_genlist_item_tooltip_text_set(Elm_Genlist_Item *item, const char *text);
    EAPI void              elm_genlist_item_tooltip_content_cb_set(Elm_Genlist_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
    EAPI void              elm_genlist_item_tooltip_unset(Elm_Genlist_Item *item);

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-11-17 17:12:43 UTC (rev 54638)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-11-17 17:15:28 UTC (rev 54639)
@@ -3,6 +3,8 @@
 #include "elm_priv.h"
 
 #define SWIPE_MOVES 12
+#define MAX_ITEMS_PER_BLOCK 32
+#define LONGPRESS_TIMEOUT 1.0
 
 /**
  * @defgroup Genlist Genlist
@@ -2123,9 +2125,9 @@
 
    wd->obj = obj;
    wd->mode = ELM_LIST_SCROLL;
-   wd->max_items_per_block = 32;
+   wd->max_items_per_block = MAX_ITEMS_PER_BLOCK;
    wd->item_cache_max = wd->max_items_per_block * 2;
-   wd->longpress_timeout = 1.0;
+   wd->longpress_timeout = LONGPRESS_TIMEOUT;
 
    evas_object_smart_callback_add(obj, "scroll-hold-on", _hold_on, obj);
    evas_object_smart_callback_add(obj, "scroll-hold-off", _hold_off, obj);
@@ -2423,7 +2425,6 @@
      {
         wd->items = eina_inlist_append(wd->items, EINA_INLIST_GET(it));
         it->rel = NULL;
-        it->before = 0;
      }
    else
      {
@@ -2437,8 +2438,8 @@
                                        EINA_INLIST_GET(it2));
         it->rel = it2;
         it->rel->relcount++;
-        it->before = 0;
      }
+   it->before = 0;
    _item_queue(wd, it);
    return it;
 }
@@ -3555,6 +3556,25 @@
    it->wd->update_job = ecore_job_add(_update_job, it->wd);
 }
 
+/**
+ * Update the item class of an item
+ *
+ * @param it The item
+ * @parem itc The item class for the item
+ *
+ * @ingroup Genlist
+ */
+EAPI void
+elm_genlist_item_item_class_update(Elm_Genlist_Item *it, const Elm_Genlist_Item_Class *itc)
+{
+   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+   if (!it->block) return;
+   if (!itc) return;
+   if (it->delete_me) return;
+   it->itc = itc;
+   elm_genlist_item_update(it);
+}
+
 static Evas_Object *
 _elm_genlist_item_label_create(void *data, Evas_Object *obj, void *item __UNUSED__)
 {
@@ -3960,8 +3980,8 @@
  * Set compress mode
  *
  * This will enable the compress mode where items are "compressed" horizontally
- * to fit the genlist scrollable viewport width. this is special for gnelist.
- * do not rely on elm_genlist_horizontal_mode_set() being set to
+ * to fit the genlist scrollable viewport width. This is special for genlist.
+ * Do not rely on elm_genlist_horizontal_mode_set() being set to
  * ELM_LIST_COMPRESS to work as genlist needs to handle it specially.
  *
  * @param obj The genlist object