Merge "Fix elm_config_font_overlay_apply() to also apply rescaling properly. Changese...
[framework/uifw/elementary.git] / src / lib / elm_diskselector.c
index 47351eb..c2b5ff0 100644 (file)
@@ -13,6 +13,7 @@
 #define DISPLAY_ITEM_NUM_MIN 3
 
 typedef struct _Widget_Data Widget_Data;
+typedef struct _Elm_Diskselector_Item Elm_Diskselector_Item;
 
 struct _Widget_Data
 {
@@ -31,8 +32,8 @@ struct _Widget_Data
    Eina_List *over_items;
    Eina_List *under_items;
    int item_count, len_threshold, len_side, display_item_num;
-   Ecore_Idler *idler;
-   Ecore_Idler *check_idler;
+   Ecore_Idle_Enterer *idler;
+   Ecore_Idle_Enterer *check_idler;
    Evas_Coord minw, minh;
    Eina_Bool init:1;
    Eina_Bool round:1;
@@ -50,10 +51,6 @@ struct _Elm_Diskselector_Item
 
 static const char *widtype = NULL;
 
-#define ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it, ...)                  \
-   ELM_WIDGET_ITEM_CHECK_OR_RETURN((Elm_Widget_Item *)it, __VA_ARGS__); \
-   ELM_CHECK_WIDTYPE(WIDGET(it), widtype) __VA_ARGS__;
-
 static Eina_Bool _move_scroller(void *data);
 static void _del_hook(Evas_Object * obj);
 static void _del_pre_hook(Evas_Object * obj);
@@ -68,10 +65,29 @@ static void _item_click_cb(void *data, Evas_Object *obj __UNUSED__,
                            const char *emission __UNUSED__,
                            const char *source __UNUSED__);
 static void _selected_item_indicate(Elm_Diskselector_Item *it);
+static void _item_text_set_hook(Elm_Object_Item *it,
+                                const char *part,
+                                const char *label);
+static const char * _item_text_get_hook(const Elm_Object_Item *it,
+                                        const char *part);
+static void _item_content_set_hook(Elm_Object_Item *it,
+                                   const char *part,
+                                   Evas_Object *content);
+static Evas_Object * _item_content_get_hook(const Elm_Object_Item *it,
+                                            const char *part);
 
 static const char SIG_SELECTED[] = "selected";
+static const char SIG_SCROLL_ANIM_START[] = "scroll,anim,start";
+static const char SIG_SCROLL_ANIM_STOP[] = "scroll,anim,stop";
+static const char SIG_SCROLL_DRAG_START[] = "scroll,drag,start";
+static const char SIG_SCROLL_DRAG_STOP[] = "scroll,drag,stop";
+
 static const Evas_Smart_Cb_Description _signals[] = {
        {SIG_SELECTED, ""},
+       {SIG_SCROLL_ANIM_START, ""},
+       {SIG_SCROLL_ANIM_STOP, ""},
+       {SIG_SCROLL_DRAG_START, ""},
+       {SIG_SCROLL_DRAG_STOP, ""},
        {NULL, NULL}
 };
 
@@ -84,9 +100,11 @@ _diskselector_object_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, vo
    wd = elm_widget_data_get(data);
    if (!wd) return;
 
-   if (wd->minw == -1 && wd->minh == -1) elm_coords_finger_size_adjust(6, &wd->minw, 1, &wd->minh);
-   edje_object_size_min_restricted_calc(elm_smart_scroller_edje_object_get(
-         wd->scroller), &wd->minw, &wd->minh, wd->minw, wd->minh);
+   if ((wd->minw == -1) && (wd->minh == -1))
+      elm_coords_finger_size_adjust(6, &wd->minw, 1, &wd->minh);
+   edje_object_size_min_restricted_calc
+      (elm_smart_scroller_edje_object_get
+          (wd->scroller), &wd->minw, &wd->minh, wd->minw, wd->minh);
    evas_object_size_hint_min_set(obj, wd->minw, wd->minh);
    evas_object_size_hint_max_set(obj, -1, -1);
 
@@ -100,7 +118,224 @@ _diskselector_object_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, vo
                                  (int)(w / wd->display_item_num), 0);
 
    if (!wd->idler)
-     wd->idler = ecore_idler_add(_move_scroller, data);
+     wd->idler = ecore_idle_enterer_before_add(_move_scroller, data);
+}
+
+static void
+_item_del(Elm_Diskselector_Item *item)
+{
+   if (!item) return;
+   eina_stringshare_del(item->label);
+   if (item->icon)
+     evas_object_del(item->icon);
+}
+
+static int
+_count_letter(const char *str)
+{
+   int pos = 0;
+   int code = 0, chnum;
+
+   for (chnum = 0; ; chnum++)
+     {
+        pos = evas_string_char_next_get(str, pos, &code);
+        if (code == 0) break;
+     }
+   return chnum;
+}
+
+static int
+_check_letter(const char *str, int length)
+{
+   int pos = 0;
+   int code = 0, chnum;
+
+   for (chnum = 0; ; chnum++)
+     {
+        if (chnum == length) break;
+        pos = evas_string_char_next_get(str, pos, &code);
+        if (code == 0) break;
+     }
+   return pos;
+}
+
+static Eina_Bool
+_check_string(void *data)
+{
+   int mid, steps, length, diff;
+   Elm_Diskselector_Item *it;
+   Eina_List *list, *l;
+   Evas_Coord ox, ow;
+   char buf[1024];
+   Widget_Data *wd = data;
+
+   evas_object_geometry_get(wd->scroller, &ox, NULL, &ow, NULL);
+   if (ow <= 0)
+     return EINA_FALSE;
+   if (!wd->init)
+     return EINA_FALSE;
+   if (!wd->round)
+     list = wd->items;
+   else
+     list = wd->r_items;
+
+   EINA_LIST_FOREACH(list, l, it)
+     {
+        Evas_Coord x, w;
+        int len;
+        evas_object_geometry_get(VIEW(it), &x, NULL, &w, NULL);
+        /* item not visible */
+        if ((x + w <= ox) || (x >= ox + ow))
+          continue;
+
+        len = _count_letter(it->label);
+//        // FIXME: len should be # of ut8f letters. ie count using utf8 string walk, not stringshare len
+//        len = eina_stringshare_strlen(it->label);
+
+        if (x <= ox + 5)
+          edje_object_signal_emit(VIEW(it), "elm,state,left_side",
+                                  "elm");
+        else if (x + w >= ox + ow - 5)
+          edje_object_signal_emit(VIEW(it), "elm,state,right_side",
+                                  "elm");
+        else
+          {
+             if ((wd->len_threshold) && (len > wd->len_threshold))
+               edje_object_signal_emit(VIEW(it), "elm,state,center_small",
+                                       "elm");
+             else
+               edje_object_signal_emit(VIEW(it), "elm,state,center",
+                                       "elm");
+          }
+
+        // if len is les that the limit len, skip anyway
+        if (len <= wd->len_side)
+          continue;
+
+        steps = len - wd->len_side + 1;
+        mid = x + w / 2;
+        if (mid <= ox + ow / 2)
+          diff = (ox + ow / 2) - mid;
+        else
+          diff = mid - (ox + ow / 2);
+
+        length = len - (int)(diff * steps / (ow / 3));
+        length = MAX(length, wd->len_side);
+        // limit string len to "length" ut8f chars
+        length = _check_letter(it->label, length);
+        // cut it off at byte mark returned form _check_letter
+        strncpy(buf, it->label, length);
+        buf[length] = '\0';
+        edje_object_part_text_escaped_set(VIEW(it), "elm.text", buf);
+     }
+
+   if (wd->check_idler)
+     ecore_idle_enterer_del(wd->check_idler);
+   wd->check_idler = NULL;
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+_item_del_pre_hook(Elm_Object_Item *it)
+{
+   Elm_Diskselector_Item *item, *item2, *dit;
+   Eina_List *l;
+   int i = 0;
+   Widget_Data *wd;
+   item = (Elm_Diskselector_Item *)it;
+   wd = elm_widget_data_get(WIDGET(item));
+   if (!wd) return EINA_FALSE;
+
+   elm_box_unpack(wd->main_box, VIEW(item));
+
+   if (wd->round)
+     wd->r_items = eina_list_remove(wd->r_items, item);
+
+   wd->items = eina_list_remove(wd->items, item);
+
+   if (wd->selected_item == item)
+     {
+        dit = (Elm_Diskselector_Item *) eina_list_nth(wd->items, 0);
+        if (dit != item)
+          wd->selected_item = dit;
+        else
+          wd->selected_item = eina_list_nth(wd->items, 1);
+
+        _selected_item_indicate(wd->selected_item);
+     }
+
+   _item_del(item);
+   wd->item_count -= 1;
+
+   if (wd->round)
+     {
+        if (!wd->item_count)
+          {
+             evas_object_hide(wd->VIEW(first));
+             evas_object_hide(wd->VIEW(second));
+             evas_object_hide(wd->VIEW(last));
+             evas_object_hide(wd->VIEW(s_last));
+
+             EINA_LIST_FOREACH(wd->under_items, l, item2)
+               evas_object_hide(VIEW(item2));
+
+             EINA_LIST_FOREACH(wd->over_items, l, item2)
+               evas_object_hide(VIEW(item2));
+          }
+        else
+          {
+             dit = eina_list_nth(wd->items, 0);
+             if (dit)
+               {
+                  eina_stringshare_replace(&wd->first->label, dit->label);
+                  edje_object_part_text_escaped_set(wd->VIEW(first), "elm.text",
+                                            wd->first->label);
+               }
+             dit = eina_list_nth(wd->items, 1);
+             if (dit)
+               {
+                  eina_stringshare_replace(&wd->second->label, dit->label);
+                  edje_object_part_text_escaped_set(wd->VIEW(second), "elm.text",
+                                            wd->second->label);
+               }
+             // if more than 3 itmes should be displayed
+             for (i = 2; i < CEIL(wd->display_item_num); i++)
+               {
+                  dit = eina_list_nth(wd->items, i);
+                  item2 = eina_list_nth(wd->over_items, i - 2);
+                  eina_stringshare_replace(&item2->label, dit->label);
+                  edje_object_part_text_escaped_set(VIEW(item2), "elm.text", item2->label);
+               }
+
+             dit = eina_list_nth(wd->items, eina_list_count(wd->items) - 1);
+             if (dit)
+               {
+                  eina_stringshare_replace(&wd->last->label, dit->label);
+                  edje_object_part_text_escaped_set(wd->VIEW(last), "elm.text",
+                                            wd->last->label);
+               }
+             dit = eina_list_nth(wd->items, eina_list_count(wd->items) - 2);
+             if (dit)
+               {
+                  eina_stringshare_replace(&wd->s_last->label, dit->label);
+                  edje_object_part_text_escaped_set(wd->VIEW(s_last), "elm.text",
+                                            wd->s_last->label);
+               }
+             // if more than 3 itmes should be displayed
+             for (i = 3; i <= CEIL(wd->display_item_num); i++)
+               {
+                  dit = eina_list_nth(wd->items, wd->item_count - i);
+                  item2 = eina_list_nth(wd->under_items, i - 3);
+                  eina_stringshare_replace(&item2->label, dit->label);
+                  edje_object_part_text_escaped_set(VIEW(item2), "elm.text",
+                                            item2->label);
+               }
+          }
+     }
+   wd->check_idler = ecore_idle_enterer_before_add(_check_string, wd);
+   _sizing_eval(wd->self);
+
+   return EINA_TRUE;
 }
 
 static Elm_Diskselector_Item *
@@ -112,6 +347,12 @@ _item_new(Evas_Object *obj, Evas_Object *icon, const char *label, Evas_Smart_Cb
    it = elm_widget_item_new(obj, Elm_Diskselector_Item);
    if (!it) return NULL;
 
+   elm_widget_item_del_pre_hook_set(it, _item_del_pre_hook);
+   elm_widget_item_text_set_hook_set(it, _item_text_set_hook);
+   elm_widget_item_text_get_hook_set(it, _item_text_get_hook);
+   elm_widget_item_content_set_hook_set(it, _item_content_set_hook);
+   elm_widget_item_content_get_hook_set(it, _item_content_get_hook);
+
    it->label = eina_stringshare_add(label);
    it->icon = icon;
    it->func = func;
@@ -126,7 +367,7 @@ _item_new(Evas_Object *obj, Evas_Object *icon, const char *label, Evas_Smart_Cb
 
    if (it->label)
      {
-        edje_object_part_text_set(VIEW(it), "elm.text", it->label);
+        edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label);
         edje_object_signal_callback_add(VIEW(it), "elm,action,click", "", _item_click_cb, it);
      }
    if (it->icon)
@@ -141,16 +382,6 @@ _item_new(Evas_Object *obj, Evas_Object *icon, const char *label, Evas_Smart_Cb
 }
 
 static void
-_item_del(Elm_Diskselector_Item *item)
-{
-   if (!item) return;
-   eina_stringshare_del(item->label);
-   if (item->icon)
-     evas_object_del(item->icon);
-   elm_widget_item_del(item);
-}
-
-static void
 _theme_data_get(Widget_Data *wd)
 {
    const char* str;
@@ -185,6 +416,11 @@ _del_hook(Evas_Object * obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
+   if (wd->idler)
+     {
+        ecore_idle_enterer_del(wd->idler);
+        wd->idler = NULL;
+     }
    free(wd);
 }
 
@@ -246,7 +482,11 @@ _del_pre_hook(Evas_Object * obj)
         }
    }
 
-   EINA_LIST_FREE(wd->items, it) _item_del(it);
+   EINA_LIST_FREE(wd->items, it)
+     {
+        _item_del(it);
+        elm_widget_item_free(it);
+     }
    eina_list_free(wd->r_items);
 }
 
@@ -275,7 +515,7 @@ _theme_hook(Evas_Object * obj)
           {
              _elm_theme_object_set(obj, VIEW(it), "diskselector", "item",
                                    elm_widget_style_get(obj));
-             edje_object_part_text_set(VIEW(it), "elm.text", it->label);
+             edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label);
           }
      }
    else
@@ -284,7 +524,7 @@ _theme_hook(Evas_Object * obj)
           {
              _elm_theme_object_set(obj, VIEW(it), "diskselector", "item",
                                    elm_widget_style_get(obj));
-             edje_object_part_text_set(VIEW(it), "elm.text", it->label);
+             edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label);
           }
      }
    _elm_theme_object_set(obj, wd->right_blank, "diskselector", "item",
@@ -367,23 +607,29 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
         return EINA_TRUE;
    }
 
-   if ((!strcmp(ev->keyname, "Left")) || (!strcmp(ev->keyname, "KP_Left")) ||
-       (!strcmp(ev->keyname, "Up"))  || (!strcmp(ev->keyname, "KP_Up")))
+   if ((!strcmp(ev->keyname, "Left")) ||
+       ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)) ||
+       (!strcmp(ev->keyname, "Up"))  ||
+       ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
      {
         l = wd->selected_item->node->prev;
         if ((!l) && (wd->round))
           l = eina_list_last(wd->items);
      }
-   else if ((!strcmp(ev->keyname, "Right")) || (!strcmp(ev->keyname, "KP_Right")) ||
-            (!strcmp(ev->keyname, "Down")) || (!strcmp(ev->keyname, "KP_Down")))
+   else if ((!strcmp(ev->keyname, "Right")) ||
+            ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)) ||
+            (!strcmp(ev->keyname, "Down")) ||
+            ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
      {
         l = wd->selected_item->node->next;
         if ((!l) && (wd->round))
           l = wd->items;
      }
-   else if ((!strcmp(ev->keyname, "Home")) || (!strcmp(ev->keyname, "KP_Home")))
+   else if ((!strcmp(ev->keyname, "Home")) ||
+            ((!strcmp(ev->keyname, "KP_Home")) && (!ev->string)))
      l = wd->items;
-   else if ((!strcmp(ev->keyname, "End")) || (!strcmp(ev->keyname, "KP_End")))
+   else if ((!strcmp(ev->keyname, "End")) ||
+            ((!strcmp(ev->keyname, "KP_End")) && (!ev->string)))
      l = eina_list_last(wd->items);
    else return EINA_FALSE;
 
@@ -394,118 +640,13 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
      {
         wd->selected_item = it;
         if (!wd->idler)
-          wd->idler = ecore_idler_add(_move_scroller, obj);
+          wd->idler = ecore_idle_enterer_before_add(_move_scroller, obj);
      }
 
    ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
    return EINA_TRUE;
 }
 
-static int
-_count_letter(const char *str)
-{
-   int pos = 0;
-   int code = 0, chnum;
-
-   for (chnum = 0; ; chnum++)
-     {
-        pos = evas_string_char_next_get(str, pos, &code);
-        if (code == 0) break;
-     }
-   return chnum;
-}
-
-static int
-_check_letter(const char *str, int length)
-{
-   int pos = 0;
-   int code = 0, chnum;
-
-   for (chnum = 0; ; chnum++)
-     {
-        if (chnum == length) break;
-        pos = evas_string_char_next_get(str, pos, &code);
-        if (code == 0) break;
-     }
-   return pos;
-}
-
-static Eina_Bool
-_check_string(void *data)
-{
-   int mid, steps, length, diff;
-   Elm_Diskselector_Item *it;
-   Eina_List *list, *l;
-   Evas_Coord ox, ow;
-   char buf[1024];
-   Widget_Data *wd = data;
-
-   evas_object_geometry_get(wd->scroller, &ox, NULL, &ow, NULL);
-   if (ow <= 0)
-     return EINA_FALSE;
-   if (!wd->init)
-     return EINA_FALSE;
-   if (!wd->round)
-     list = wd->items;
-   else
-     list = wd->r_items;
-
-   EINA_LIST_FOREACH(list, l, it)
-     {
-        Evas_Coord x, w;
-        int len;
-        evas_object_geometry_get(VIEW(it), &x, NULL, &w, NULL);
-        /* item not visible */
-        if ((x + w <= ox) || (x >= ox + ow))
-          continue;
-
-        len = _count_letter(it->label);
-//        // FIXME: len should be # of ut8f letters. ie count using utf8 string walk, not stringshare len
-//        len = eina_stringshare_strlen(it->label);
-
-        if (x <= ox + 5)
-          edje_object_signal_emit(VIEW(it), "elm,state,left_side",
-                                  "elm");
-        else if (x + w >= ox + ow - 5)
-          edje_object_signal_emit(VIEW(it), "elm,state,right_side",
-                                  "elm");
-        else
-          {
-             if ((wd->len_threshold) && (len > wd->len_threshold))
-               edje_object_signal_emit(VIEW(it), "elm,state,center_small",
-                                       "elm");
-             else
-               edje_object_signal_emit(VIEW(it), "elm,state,center",
-                                       "elm");
-          }
-
-        // if len is les that the limit len, skip anyway
-        if (len <= wd->len_side)
-          continue;
-
-        steps = len - wd->len_side + 1;
-        mid = x + w / 2;
-        if (mid <= ox + ow / 2)
-          diff = (ox + ow / 2) - mid;
-        else
-          diff = mid - (ox + ow / 2);
-
-        length = len - (int)(diff * steps / (ow / 3));
-        length = MAX(length, wd->len_side);
-        // limit string len to "length" ut8f chars
-        length = _check_letter(it->label, length);
-        // cut it off at byte mark returned form _check_letter
-        strncpy(buf, it->label, length);
-        buf[length] = '\0';
-        edje_object_part_text_set(VIEW(it), "elm.text", buf);
-     }
-
-   if (wd->check_idler)
-     ecore_idler_del(wd->check_idler);
-   wd->check_idler = NULL;
-   return EINA_FALSE;
-}
-
 static void
 _selected_item_indicate(Elm_Diskselector_Item *it)
 {
@@ -515,10 +656,12 @@ _selected_item_indicate(Elm_Diskselector_Item *it)
    wd = elm_widget_data_get(WIDGET(it));
 
    if (!wd) return;
+   if (!it->label) return;
 
    EINA_LIST_FOREACH(wd->r_items, l, item)
      {
-        if (!strcmp(item->label, it->label)) edje_object_signal_emit(VIEW(item), "elm,state,selected", "elm");
+        if (item->label && !strcmp(item->label, it->label))
+           edje_object_signal_emit(VIEW(item), "elm,state,selected", "elm");
         else
            edje_object_signal_emit(VIEW(item), "elm,state,default", "elm");
      }
@@ -573,12 +716,11 @@ static void
 _scroller_stop_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Elm_Diskselector_Item *it;
-   Widget_Data *wd = data;
+   Widget_Data *wd = elm_widget_data_get(data);
    Evas_Coord x, w, ow;
    Eina_List *l, *list;
 
-   if (wd->idler)
-     return;
+   if (wd->idler) return;
 
    if (!wd->round)
      list = wd->items;
@@ -589,14 +731,33 @@ _scroller_stop_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
    EINA_LIST_FOREACH(list, l, it)
      {
         evas_object_geometry_get(VIEW(it), &x, NULL, &w, NULL);
-        if (abs((int)(ow / 2 - (int)(x + w / 2))) < 10)
-          break;
-     }
-
-   if (!it)
-     return;
+        if (abs((int)(ow / 2 - (int)(x + w / 2))) < 10) break;
+     }
 
+   if (!it) return;
    _select_item(it);
+   evas_object_smart_callback_call(data, SIG_SCROLL_ANIM_STOP, it);
+}
+
+static void
+_scroller_start_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   evas_object_smart_callback_call(data, SIG_SCROLL_ANIM_START,
+                                   elm_diskselector_selected_item_get(data));
+}
+
+static void
+_drag_start_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   evas_object_smart_callback_call(data, SIG_SCROLL_DRAG_START,
+                                   elm_diskselector_selected_item_get(data));
+}
+
+static void
+_drag_stop_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   evas_object_smart_callback_call(data, SIG_SCROLL_DRAG_STOP,
+                                   elm_diskselector_selected_item_get(data));
 }
 
 static Eina_Bool
@@ -604,7 +765,7 @@ _move_scroller(void *data)
 {
    Evas_Object *obj = data;
    Widget_Data *wd;
-   Eina_List *l;
+   Eina_List *list, *l;
    Elm_Diskselector_Item *dit;
    Evas_Coord y, w, h;
    int i;
@@ -612,17 +773,26 @@ _move_scroller(void *data)
    wd = elm_widget_data_get(obj);
    if (!wd) return EINA_FALSE;
 
-   if (wd->round)
-     i = 1;
+   if (!wd->round)
+     {
+        i = 0;
+        list = wd->items;
+     }
    else
-     i = 0;
+     {
+        i = 1;
+        list = wd->r_items;
+     }
 
-   EINA_LIST_FOREACH(wd->items, l, dit)
+   EINA_LIST_FOREACH(list, l, dit)
      {
         if (wd->selected_item == dit)
-          break;
+           break;
         i++;
      }
+
+   if (wd->round) i -= CEIL(wd->display_item_num);
+
    if (!dit)
      {
         wd->selected_item =
@@ -639,7 +809,7 @@ _move_scroller(void *data)
    _select_item(dit);
    if (wd->idler)
      {
-        ecore_idler_del(wd->idler);
+        ecore_idle_enterer_del(wd->idler);
         wd->idler = NULL;
      }
    wd->init = EINA_TRUE;
@@ -655,8 +825,7 @@ _round_item_del(Widget_Data *wd, Elm_Diskselector_Item *it)
    elm_box_unpack(wd->main_box, VIEW(it));
    wd->r_items = eina_list_remove(wd->r_items, it);
    eina_stringshare_del(it->label);
-   evas_object_del(VIEW(it));
-   free(it);
+   elm_widget_item_free(it);
 }
 
 static void
@@ -677,14 +846,14 @@ _round_items_del(Widget_Data *wd)
    EINA_LIST_FOREACH(wd->under_items, l, it)
      {
         _round_item_del(wd, it);
-        it = NULL;
      }
+   wd->under_items = eina_list_free(wd->under_items);
 
    EINA_LIST_FOREACH(wd->over_items, l, it)
      {
         _round_item_del(wd, it);
-        it = NULL;
      }
+   wd->over_items = eina_list_free(wd->over_items);
 }
 
 static void
@@ -759,6 +928,106 @@ _round_items_add(Widget_Data *wd)
      }
 }
 
+static void
+_item_icon_set(Elm_Diskselector_Item *it, Evas_Object *icon)
+{
+   if (it->icon == icon) return;
+   if (it->icon) evas_object_del(it->icon);
+   it->icon = icon;
+   if (VIEW(it))
+     {
+        evas_object_size_hint_min_set(it->icon, 24, 24);
+        evas_object_size_hint_max_set(it->icon, 40, 40);
+        edje_object_part_swallow(VIEW(it), "elm.swallow.icon", it->icon);
+        evas_object_show(it->icon);
+        elm_widget_sub_object_add(WIDGET(it), it->icon);
+     }
+}
+
+static void
+_check_identical_item(Elm_Diskselector_Item *it, Evas_Object *icon)
+{
+   Widget_Data *wd;
+   Elm_Diskselector_Item *dit;
+   Eina_List *l;
+   int idx = 0;
+   int ic = 0;
+   int ac = 0;
+
+   wd = elm_widget_data_get(WIDGET(it));
+   if (!wd) return;
+
+   if (wd->round)
+     {
+        // Get index from indentical item from round items
+        EINA_LIST_FOREACH(wd->r_items, l, dit)
+          {
+             if (it == dit) break;
+             idx++;
+          }
+
+        // No item to match
+        ic = eina_list_count(wd->r_items);
+        if (idx >= ic) return;
+        dit = NULL;
+
+        // Number of added items: CEIL(wd->display_item_num)
+        ac = CEIL(wd->display_item_num);
+
+        if (((idx >= 0) && (idx < ac)) ||
+            ((idx >= ac) && (idx < (2 * ac))))
+          {
+              // Selected item: under, low region
+             dit = eina_list_nth(wd->r_items,
+                                 idx + ic - (2 * ac));
+          }
+        else if (((idx >= (ic - ac)) && (idx < ic)) ||
+                 ((idx >= (ic - (2 * ac))) && (idx < ic - ac)))
+          {
+              // Selected item: over, high region
+              dit = eina_list_nth(wd->r_items,
+                                  idx - ic + (2 * ac));
+          }
+
+        if (dit) _item_icon_set(dit, icon);
+        _sizing_eval(wd->self);
+     }
+}
+
+static void
+_item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
+{
+   Elm_Diskselector_Item *item;
+   if (part && strcmp(part, "default")) return;
+   item = (Elm_Diskselector_Item *)it;
+   eina_stringshare_replace(&item->label, label);
+   edje_object_part_text_escaped_set(VIEW(item), "elm.text", item->label);
+}
+
+static const char *
+_item_text_get_hook(const Elm_Object_Item *it, const char *part)
+{
+   if (part && strcmp(part, "default")) return NULL;
+   return ((Elm_Diskselector_Item *)it)->label;
+}
+
+static void
+_item_content_set_hook(Elm_Object_Item *it,
+                       const char *part,
+                       Evas_Object *content)
+{
+   if (part && strcmp(part, "icon")) return;
+   _item_icon_set((Elm_Diskselector_Item *)it, content);
+   _check_identical_item((Elm_Diskselector_Item *)it, content);
+}
+
+static Evas_Object *
+_item_content_get_hook(const Elm_Object_Item *it, const char *part)
+{
+   if (part && strcmp(part, "icon")) return NULL;
+   return ((Elm_Diskselector_Item *)it)->icon;
+}
+
 EAPI Evas_Object *
 elm_diskselector_add(Evas_Object *parent)
 {
@@ -796,7 +1065,14 @@ elm_diskselector_add(Evas_Object *parent)
    evas_object_smart_callback_add(wd->scroller, "scroll", _scroller_move_cb,
                                   wd);
    evas_object_smart_callback_add(wd->scroller, "animate,stop",
-                                  _scroller_stop_cb, wd);
+                                  _scroller_stop_cb, obj);
+   evas_object_smart_callback_add(wd->scroller, "animate,start",
+                                  _scroller_start_cb, obj);
+   evas_object_smart_callback_add(wd->scroller, "drag,stop",
+                                  _drag_stop_cb, obj);
+   evas_object_smart_callback_add(wd->scroller, "drag,start",
+                                  _drag_start_cb, obj);
+
    _elm_theme_object_set(obj, wd->scroller, "diskselector", "base",
                          "default");
    evas_object_event_callback_add(wd->scroller, EVAS_CALLBACK_RESIZE,
@@ -844,7 +1120,7 @@ elm_diskselector_add(Evas_Object *parent)
 }
 
 EAPI Eina_Bool
-elm_diskselector_round_get(const Evas_Object *obj)
+elm_diskselector_round_enabled_get(const Evas_Object *obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -853,7 +1129,7 @@ elm_diskselector_round_get(const Evas_Object *obj)
 }
 
 EAPI void
-elm_diskselector_round_set(Evas_Object * obj, Eina_Bool round)
+elm_diskselector_round_enabled_set(Evas_Object * obj, Eina_Bool enabled)
 {
    Eina_List *elist;
    Elm_Diskselector_Item *it;
@@ -862,11 +1138,11 @@ elm_diskselector_round_set(Evas_Object * obj, Eina_Bool round)
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
 
-   if (wd->round == round)
+   if (wd->round == enabled)
      return;
 
-   wd->round = round;
-   if (round)
+   wd->round = !!enabled;
+   if (enabled)
      {
         wd->r_items = eina_list_clone(wd->items);
         elm_box_unpack(wd->main_box, wd->left_blank);
@@ -905,11 +1181,12 @@ elm_diskselector_round_set(Evas_Object * obj, Eina_Bool round)
         wd->r_items = NULL;
      }
 
+   _selected_item_indicate(wd->selected_item);
    _sizing_eval(obj);
 }
 
 EAPI int
-elm_diskselector_side_label_length_get(const Evas_Object *obj)
+elm_diskselector_side_text_max_length_get(const Evas_Object *obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) 0;
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -918,7 +1195,7 @@ elm_diskselector_side_label_length_get(const Evas_Object *obj)
 }
 
 EAPI void
-elm_diskselector_side_label_length_set(Evas_Object *obj, int len)
+elm_diskselector_side_text_max_length_set(Evas_Object *obj, int len)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -927,18 +1204,6 @@ elm_diskselector_side_label_length_set(Evas_Object *obj, int len)
 }
 
 EAPI void
-elm_diskselector_side_label_lenght_set(Evas_Object *obj, int len)
-{
-   return elm_diskselector_side_label_length_set(obj, len);
-}
-
-EAPI int
-elm_diskselector_side_label_lenght_get(const Evas_Object *obj)
-{
-   return elm_diskselector_side_label_length_get(obj);
-}
-
-EAPI void
 elm_diskselector_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
@@ -974,10 +1239,11 @@ elm_diskselector_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy polic
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   if ((policy_h >= 3) || (policy_v >= 3)) return;
-   if (wd->scroller)
-     elm_smart_scroller_policy_set(wd->scroller, policy_h, policy_v);
+   if ((!wd) || (!wd->scroller)) return;
+   if ((policy_h >= ELM_SCROLLER_POLICY_LAST) ||
+       (policy_v >= ELM_SCROLLER_POLICY_LAST))
+     return;
+   elm_smart_scroller_policy_set(wd->scroller, policy_h, policy_v);
 }
 
 EAPI void
@@ -991,7 +1257,11 @@ elm_diskselector_clear(Evas_Object *obj)
    if (!wd->items) return;
 
    wd->selected_item = NULL;
-   EINA_LIST_FREE(wd->items, it) _item_del(it);
+   EINA_LIST_FREE(wd->items, it)
+     {
+        _item_del(it);
+        elm_widget_item_free(it);
+     }
    _round_items_del(wd);
    _sizing_eval(obj);
 }
@@ -1005,7 +1275,7 @@ elm_diskselector_items_get(const Evas_Object *obj)
    return wd->items;
 }
 
-EAPI Elm_Diskselector_Item *
+EAPI Elm_Object_Item *
 elm_diskselector_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Smart_Cb func, const void *data)
 {
    Elm_Diskselector_Item *it;
@@ -1041,329 +1311,90 @@ elm_diskselector_item_append(Evas_Object *obj, const char *label, Evas_Object *i
    if (!wd->selected_item)
      wd->selected_item = it;
    if (!wd->idler)
-     wd->idler = ecore_idler_add(_move_scroller, obj);
+     wd->idler = ecore_idle_enterer_before_add(_move_scroller, obj);
    _sizing_eval(obj);
-   return it;
-}
-
-EAPI void
-elm_diskselector_item_del(Elm_Diskselector_Item * it)
-{
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it);
-   Elm_Diskselector_Item *dit;
-   Elm_Diskselector_Item *item;
-   Eina_List *l;
-   int i = 0;
-   Widget_Data *wd = elm_widget_data_get(WIDGET(it));
-   if (!wd) return;
-
-   elm_box_unpack(wd->main_box, VIEW(it));
-
-   if (wd->round)
-     wd->r_items = eina_list_remove(wd->r_items, it);
-
-   wd->items = eina_list_remove(wd->items, it);
-
-   if (wd->selected_item == it)
-     {
-        dit = (Elm_Diskselector_Item *) eina_list_nth(wd->items, 0);
-        if (dit != it)
-          wd->selected_item = dit;
-        else
-          wd->selected_item = eina_list_nth(wd->items, 1);
-
-        _selected_item_indicate(wd->selected_item);
-     }
-
-   _item_del(it);
-   wd->item_count -= 1;
-
-   if (wd->round)
-     {
-        if (!wd->item_count)
-          {
-             evas_object_hide(wd->VIEW(first));
-             evas_object_hide(wd->VIEW(second));
-             evas_object_hide(wd->VIEW(last));
-             evas_object_hide(wd->VIEW(s_last));
-
-             EINA_LIST_FOREACH(wd->under_items, l, item)
-                evas_object_hide(VIEW(item));
-
-             EINA_LIST_FOREACH(wd->over_items, l, item)
-                evas_object_hide(VIEW(item));
-          }
-        else
-          {
-             dit = eina_list_nth(wd->items, 0);
-             if (dit)
-               {
-                  eina_stringshare_replace(&wd->first->label, dit->label);
-                  edje_object_part_text_set(wd->VIEW(first), "elm.text",
-                                            wd->first->label);
-               }
-             dit = eina_list_nth(wd->items, 1);
-             if (dit)
-               {
-                  eina_stringshare_replace(&wd->second->label, dit->label);
-                  edje_object_part_text_set(wd->VIEW(second), "elm.text",
-                                            wd->second->label);
-               }
-             // if more than 3 itmes should be displayed
-             for (i = 2; i < CEIL(wd->display_item_num); i++)
-               {
-                  dit = eina_list_nth(wd->items, i);
-                  item = eina_list_nth(wd->over_items, i - 2);
-                  eina_stringshare_replace(&item->label, dit->label);
-                  edje_object_part_text_set(VIEW(item), "elm.text", item->label);
-               }
-
-             dit = eina_list_nth(wd->items, eina_list_count(wd->items) - 1);
-             if (dit)
-               {
-                  eina_stringshare_replace(&wd->last->label, dit->label);
-                  edje_object_part_text_set(wd->VIEW(last), "elm.text",
-                                            wd->last->label);
-               }
-             dit = eina_list_nth(wd->items, eina_list_count(wd->items) - 2);
-             if (dit)
-               {
-                  eina_stringshare_replace(&wd->s_last->label, dit->label);
-                  edje_object_part_text_set(wd->VIEW(s_last), "elm.text",
-                                            wd->s_last->label);
-               }
-             // if more than 3 itmes should be displayed
-             for (i = 3; i <= CEIL(wd->display_item_num); i++)
-               {
-                  dit = eina_list_nth(wd->items, wd->item_count - i);
-                  item = eina_list_nth(wd->under_items, i - 3);
-                  eina_stringshare_replace(&item->label, dit->label);
-                  edje_object_part_text_set(VIEW(item), "elm.text", item->label);
-               }
-          }
-     }
-   wd->check_idler = ecore_idler_add(_check_string, wd);
-   _sizing_eval(wd->self);
-}
-
-EAPI const char *
-elm_diskselector_item_label_get(const Elm_Diskselector_Item * it)
-{
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it, NULL);
-   return it->label;
-}
-
-EAPI void
-elm_diskselector_item_label_set(Elm_Diskselector_Item * it, const char *label)
-{
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it);
-   eina_stringshare_replace(&it->label, label);
-   edje_object_part_text_set(VIEW(it), "elm.text", it->label);
+   return (Elm_Object_Item *)it;
 }
 
-EAPI Elm_Diskselector_Item *
+EAPI Elm_Object_Item *
 elm_diskselector_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;
+   return (Elm_Object_Item *) wd->selected_item;
 }
 
 EAPI void
-elm_diskselector_item_selected_set(Elm_Diskselector_Item *it, Eina_Bool selected)
+elm_diskselector_item_selected_set(Elm_Object_Item *it, Eina_Bool selected)
 {
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it);
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
    Widget_Data *wd;
-   wd = elm_widget_data_get(WIDGET(it));
+   Elm_Diskselector_Item *item = (Elm_Diskselector_Item *)it;
+   wd = elm_widget_data_get(WIDGET(item));
    if (!wd) return;
 
-   if ((wd->selected_item == it) && (selected))
+   if ((wd->selected_item == item) && (selected))
      return;
 
-   if ((wd->selected_item == it) && (!selected))
+   if ((wd->selected_item == item) && (!selected))
      wd->selected_item = eina_list_data_get(wd->items);
    else
      {
-        wd->selected_item = it;
+        wd->selected_item = item;
         _selected_item_indicate(wd->selected_item);
      }
 
    if (!wd->idler)
-     ecore_idler_add(_move_scroller, WIDGET(it));
+     wd->idler = ecore_idle_enterer_before_add(_move_scroller, WIDGET(item));
 }
 
 EAPI Eina_Bool
-elm_diskselector_item_selected_get(const Elm_Diskselector_Item *it)
+elm_diskselector_item_selected_get(const Elm_Object_Item *it)
 {
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
-   Widget_Data *wd;
-
-   wd = elm_widget_data_get(WIDGET(it));
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
+   Widget_Data *wd = elm_widget_data_get(WIDGET(it));
    if (!wd) return EINA_FALSE;
-   return (wd->selected_item == it);
-}
-
-EAPI void
-elm_diskselector_item_del_cb_set(Elm_Diskselector_Item *it, Evas_Smart_Cb func)
-{
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it);
-   elm_widget_item_del_cb_set(it, func);
-}
-
-EAPI void *
-elm_diskselector_item_data_get(const Elm_Diskselector_Item *it)
-{
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it, NULL);
-   return elm_widget_item_data_get(it);
-}
-
-EAPI Evas_Object *
-elm_diskselector_item_icon_get(const Elm_Diskselector_Item *it)
-{
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it, NULL);
-   return it->icon;
-}
-
-EAPI void
-elm_diskselector_item_icon_set(Elm_Diskselector_Item *it, Evas_Object *icon)
-{
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it);
-   if (it->icon == icon) return;
-   if (it->icon)
-     evas_object_del(it->icon);
-   it->icon = icon;
-   if (it->base.view)
-     edje_object_part_swallow(it->base.view, "elm.swallow.icon", icon);
+   return (wd->selected_item == ((Elm_Diskselector_Item *)it));
 }
 
-EAPI Elm_Diskselector_Item *
-elm_diskselector_item_prev_get(const Elm_Diskselector_Item *it)
+EAPI Elm_Object_Item *
+elm_diskselector_item_prev_get(const Elm_Object_Item *it)
 {
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it, NULL);
-   if (it->node->prev) return it->node->prev->data;
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+   Elm_Diskselector_Item *item = (Elm_Diskselector_Item *)it;
+   if (item->node->prev) return item->node->prev->data;
    else return NULL;
 }
 
-EAPI Elm_Diskselector_Item *
-elm_diskselector_item_next_get(const Elm_Diskselector_Item *it)
+EAPI Elm_Object_Item *
+elm_diskselector_item_next_get(const Elm_Object_Item *it)
 {
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it, NULL);
-   if (it->node->next) return it->node->next->data;
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+   Elm_Diskselector_Item *item = (Elm_Diskselector_Item *)it;
+   if (item->node->next) return item->node->next->data;
    else return NULL;
 }
 
-EAPI Elm_Diskselector_Item *
+EAPI Elm_Object_Item *
 elm_diskselector_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;
-
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd || !wd->items) return NULL;
    return eina_list_data_get(wd->items);
 }
 
-EAPI Elm_Diskselector_Item *
+EAPI Elm_Object_Item *
 elm_diskselector_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;
-
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd || !wd->items) return NULL;
    return eina_list_data_get(eina_list_last(wd->items));
 }
 
 EAPI void
-elm_diskselector_item_tooltip_text_set(Elm_Diskselector_Item *item, const char *text)
-{
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item);
-   elm_widget_item_tooltip_text_set(item, text);
-}
-
-EAPI void
-elm_diskselector_item_tooltip_content_cb_set(Elm_Diskselector_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb)
-{
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item);
-   elm_widget_item_tooltip_content_cb_set(item, func, data, del_cb);
-}
-
-EAPI void
-elm_diskselector_item_tooltip_unset(Elm_Diskselector_Item *item)
-{
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item);
-   elm_widget_item_tooltip_unset(item);
-}
-
-EAPI void
-elm_diskselector_item_tooltip_style_set(Elm_Diskselector_Item *item, const char *style)
-{
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item);
-   elm_widget_item_tooltip_style_set(item, style);
-}
-
-EAPI const char *
-elm_diskselector_item_tooltip_style_get(const Elm_Diskselector_Item *item)
-{
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item, NULL);
-   return elm_widget_item_tooltip_style_get(item);
-}
-
-EAPI void
-elm_diskselector_item_cursor_set(Elm_Diskselector_Item *item, const char *cursor)
-{
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item);
-   elm_widget_item_cursor_set(item, cursor);
-}
-
-EAPI const char *
-elm_diskselector_item_cursor_get(const Elm_Diskselector_Item *item)
-{
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item, NULL);
-   return elm_widget_item_cursor_get(item);
-}
-
-EAPI void
-elm_diskselector_item_cursor_unset(Elm_Diskselector_Item *item)
-{
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item);
-   elm_widget_item_cursor_unset(item);
-}
-
-EAPI void
-elm_diskselector_item_cursor_style_set(Elm_Diskselector_Item *item, const char *style)
-{
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item);
-   elm_widget_item_cursor_style_set(item, style);
-}
-
-EAPI const char *
-elm_diskselector_item_cursor_style_get(const Elm_Diskselector_Item *item)
-{
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item, NULL);
-   return elm_widget_item_cursor_style_get(item);
-}
-
-EAPI void
-elm_diskselector_item_cursor_engine_only_set(Elm_Diskselector_Item *item, Eina_Bool engine_only)
-{
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item);
-   elm_widget_item_cursor_engine_only_set(item, engine_only);
-}
-
-EAPI Eina_Bool
-elm_diskselector_item_cursor_engine_only_get(const Elm_Diskselector_Item *item)
-{
-   ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item, EINA_FALSE);
-   return elm_widget_item_cursor_engine_only_get(item);
-}
-
-EAPI void
 elm_diskselector_display_item_num_set(Evas_Object *obj, int num)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);