X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Flib%2Felm_flipselector.c;h=7939aba8e08a3eaf5fa721d46310eb70ed69a60f;hb=8b32f3712183fc44ce1f965e8a95069fe2bbc6cd;hp=5780e3acd095b4a9e90a96f6852c6f1d01e7749c;hpb=6922784eaf411b14958dc8163ebab0400082e249;p=framework%2Fuifw%2Felementary.git

diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index 5780e3a..7939aba 100644
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -81,7 +81,7 @@ _item_text_set_hook(Elm_Object_Item *it,
 
    if (part && strcmp(part ,"default")) return;
 
-   item = (Elm_Flipselector_Item *) it;
+   item = (Elm_Flipselector_Item *)it;
    wd = elm_widget_data_get(WIDGET(item));
    if ((!wd) || (!wd->items)) return;
 
@@ -106,7 +106,7 @@ _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {
    if (part && strcmp(part ,"default")) return NULL;
 
-   return ((Elm_Flipselector_Item *) it)->label;
+   return ((Elm_Flipselector_Item *)it)->label;
 }
 
 static void
@@ -114,7 +114,7 @@ _item_signal_emit_hook(Elm_Object_Item *it,
                        const char *emission,
                        const char *source)
 {
-   Elm_Flipselector_Item *item = (Elm_Flipselector_Item *) it;
+   Elm_Flipselector_Item *item = (Elm_Flipselector_Item *)it;
    edje_object_signal_emit(VIEW(item), emission, source);
 }
 
@@ -226,7 +226,7 @@ _sentinel_eval(Widget_Data *wd)
 
    EINA_LIST_FOREACH(wd->items, l, it)
      {
-        if (strlen(elm_object_item_text_get((Elm_Object_Item *) it)) >
+        if (strlen(elm_object_item_text_get((Elm_Object_Item *)it)) >
             strlen(elm_object_item_text_get(DATA_GET(wd->sentinel))))
           wd->sentinel = l;
      }
@@ -324,6 +324,7 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
      return EINA_FALSE;
 
    if (wd->spin) ecore_timer_del(wd->spin);
+   wd->spin = NULL;
 
    /* TODO: if direction setting via API is not coming in, replace
       these calls by flip_{next,prev} */
@@ -370,15 +371,15 @@ _sizing_eval(Evas_Object *obj)
    if (wd->sentinel)
      {
         const char *label = elm_object_item_text_get(DATA_GET(wd->sentinel));
-        tmp = edje_object_part_text_get(wd->base, "top");
-        edje_object_part_text_set(wd->base, "top", label);
+        tmp = edje_object_part_text_get(wd->base, "elm.top");
+        edje_object_part_text_escaped_set(wd->base, "elm.top", label);
      }
 
    edje_object_size_min_restricted_calc(wd->base, &minw, &minh, minw, minh);
    elm_coords_finger_size_adjust(1, &minw, 2, &minh);
    evas_object_size_hint_min_get(obj, &w, &h);
 
-   if (wd->sentinel) edje_object_part_text_set(wd->base, "top", tmp);
+   if (wd->sentinel) edje_object_part_text_escaped_set(wd->base, "elm.top", tmp);
 
    if (w > minw) minw = w;
    if (h > minh) minh = h;
@@ -400,8 +401,8 @@ _update_view(Evas_Object *obj)
    item = DATA_GET(wd->current);
    if (item) label = item->label;
 
-   edje_object_part_text_set(wd->base, "top", label ? label : "");
-   edje_object_part_text_set(wd->base, "bottom", label ? label : "");
+   edje_object_part_text_escaped_set(wd->base, "elm.top", label ? label : "");
+   edje_object_part_text_escaped_set(wd->base, "elm.bottom", label ? label : "");
    edje_object_message_signal_process(wd->base);
 }
 
@@ -579,7 +580,7 @@ _item_del_pre_hook(Elm_Object_Item *it)
    Elm_Flipselector_Item *item, *item2;
    Eina_List *l;
 
-   item = (Elm_Flipselector_Item *) it;
+   item = (Elm_Flipselector_Item *)it;
    wd = elm_widget_data_get(WIDGET(item));
    if (!wd) return EINA_FALSE;
 
@@ -663,6 +664,7 @@ elm_flipselector_flip_next(Evas_Object *obj)
    if (!wd) return;
 
    if (wd->spin) ecore_timer_del(wd->spin);
+   wd->spin = NULL;
 
    _flipselector_walk(wd);
    _flip_down(wd);
@@ -678,6 +680,7 @@ elm_flipselector_flip_prev(Evas_Object *obj)
    if (!wd) return;
 
    if (wd->spin) ecore_timer_del(wd->spin);
+   wd->spin = NULL;
 
    _flipselector_walk(wd);
    _flip_up(wd);
@@ -706,7 +709,7 @@ elm_flipselector_item_append(Evas_Object *obj, const char *label, void (*func)(v
      }
 
    if (!wd->sentinel ||
-       (strlen(elm_object_item_text_get((Elm_Object_Item *) item)) >
+       (strlen(elm_object_item_text_get((Elm_Object_Item *)item)) >
         strlen(elm_object_item_text_get(DATA_GET(wd->sentinel)))))
      {
         wd->sentinel = eina_list_last(wd->items);
@@ -716,7 +719,7 @@ elm_flipselector_item_append(Evas_Object *obj, const char *label, void (*func)(v
    if (eina_list_count(wd->items) >= 2)
      edje_object_signal_emit(wd->base, "elm,state,button,visible", "elm");
 
-   return (Elm_Object_Item *) item;
+   return (Elm_Object_Item *)item;
 }
 
 EAPI Elm_Object_Item *
@@ -741,7 +744,7 @@ elm_flipselector_item_prepend(Evas_Object *obj, const char *label, void (*func)(
      }
 
    if (!wd->sentinel ||
-       (strlen(elm_object_item_text_get((Elm_Object_Item *) item)) >
+       (strlen(elm_object_item_text_get((Elm_Object_Item *)item)) >
         strlen(elm_object_item_text_get(DATA_GET(wd->sentinel)))))
      {
         wd->sentinel = wd->items;
@@ -751,7 +754,7 @@ elm_flipselector_item_prepend(Evas_Object *obj, const char *label, void (*func)(
    if (eina_list_count(wd->items) >= 2)
      edje_object_signal_emit(wd->base, "elm,state,button,visible", "elm");
 
-   return (Elm_Object_Item *) item;
+   return (Elm_Object_Item *)item;
 }
 
 EAPI const Eina_List *
@@ -779,7 +782,7 @@ elm_flipselector_first_item_get(const Evas_Object *obj)
    EINA_LIST_FOREACH(wd->items, l, it)
      {
         if (it->deleted) continue;
-        return (Elm_Object_Item *) it;
+        return (Elm_Object_Item *)it;
      }
    return NULL;
 }
@@ -799,7 +802,7 @@ elm_flipselector_last_item_get(const Evas_Object *obj)
    EINA_LIST_REVERSE_FOREACH(wd->items, l, it)
      {
         if (it->deleted) continue;
-        return (Elm_Object_Item *) it;
+        return (Elm_Object_Item *)it;
      }
    return NULL;
 }
@@ -824,7 +827,7 @@ elm_flipselector_item_selected_set(Elm_Object_Item *it, Eina_Bool selected)
    Widget_Data *wd;
    Eina_List *l;
 
-   item = (Elm_Flipselector_Item *) it;
+   item = (Elm_Flipselector_Item *)it;
    wd = elm_widget_data_get(WIDGET(item));
    if (!wd) return;
 
@@ -870,30 +873,12 @@ elm_flipselector_item_selected_get(const Elm_Object_Item *it)
    Widget_Data *wd;
    Elm_Flipselector_Item *item;
 
-   item = (Elm_Flipselector_Item *) it;
+   item = (Elm_Flipselector_Item *)it;
    wd = elm_widget_data_get(WIDGET(item));
    if (!wd) return EINA_FALSE;
    return (eina_list_data_get(wd->current) == item);
 }
 
-EAPI void
-elm_flipselector_item_del(Elm_Object_Item *it)
-{
-   elm_object_item_del(it);
-}
-
-EAPI const char *
-elm_flipselector_item_label_get(const Elm_Object_Item *it)
-{
-   return _item_text_get_hook(it, NULL);
-}
-
-EAPI void
-elm_flipselector_item_label_set(Elm_Object_Item *it, const char *label)
-{
-   _item_text_set_hook(it, NULL, label);
-}
-
 EAPI Elm_Object_Item *
 elm_flipselector_item_prev_get(const Elm_Object_Item *it)
 {
@@ -901,7 +886,7 @@ elm_flipselector_item_prev_get(const Elm_Object_Item *it)
 
    Widget_Data *wd;
    Eina_List *l;
-   Elm_Flipselector_Item *item = (Elm_Flipselector_Item *) it;
+   Elm_Flipselector_Item *item = (Elm_Flipselector_Item *)it;
 
    wd = elm_widget_data_get(WIDGET(item));
    if ((!wd) || (!wd->items)) return NULL;
@@ -919,7 +904,7 @@ elm_flipselector_item_next_get(const Elm_Object_Item *it)
 
    Widget_Data *wd;
    Eina_List *l;
-   Elm_Flipselector_Item *item = (Elm_Flipselector_Item *) it;
+   Elm_Flipselector_Item *item = (Elm_Flipselector_Item *)it;
 
    wd = elm_widget_data_get(WIDGET(item));
    if ((!wd) || (!wd->items)) return NULL;
@@ -931,7 +916,7 @@ elm_flipselector_item_next_get(const Elm_Object_Item *it)
 }
 
 EAPI void
-elm_flipselector_interval_set(Evas_Object *obj, double interval)
+elm_flipselector_first_interval_set(Evas_Object *obj, double interval)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
 
@@ -941,7 +926,7 @@ elm_flipselector_interval_set(Evas_Object *obj, double interval)
 }
 
 EAPI double
-elm_flipselector_interval_get(const Evas_Object *obj)
+elm_flipselector_first_interval_get(const Evas_Object *obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) 0;