X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Flib%2Felm_flipselector.c;h=7939aba8e08a3eaf5fa721d46310eb70ed69a60f;hb=8b32f3712183fc44ce1f965e8a95069fe2bbc6cd;hp=a11fc27e94988fdc4151b70d667e4eaad020e0b9;hpb=c4820bc63e3cea536c6ae27d26b03863f37cc1e6;p=framework%2Fuifw%2Felementary.git diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c index a11fc27..7939aba 100644 --- a/src/lib/elm_flipselector.c +++ b/src/lib/elm_flipselector.c @@ -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); } @@ -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); @@ -931,15 +934,3 @@ elm_flipselector_first_interval_get(const Evas_Object *obj) if (!wd) return 0; return wd->first_interval; } - -EINA_DEPRECATED EAPI void -elm_flipselector_interval_set(Evas_Object *obj, double interval) -{ - elm_flipselector_first_interval_set(obj, interval); -} - -EINA_DEPRECATED EAPI double -elm_flipselector_interval_get(const Evas_Object *obj) -{ - return elm_flipselector_first_interval_get(obj); -}