From: chuneon.park Date: Thu, 17 Mar 2011 12:00:03 +0000 (+0900) Subject: revert elm_pager.c X-Git-Tag: REL_I9200_20110603-1~260^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=77acb1c8ba37e752f97983174d52dcd645cb48c1;p=framework%2Fuifw%2Felementary.git revert elm_pager.c --- diff --git a/src/lib/elm_pager.c b/src/lib/elm_pager.c index 873c820..0f03ed7 100644 --- a/src/lib/elm_pager.c +++ b/src/lib/elm_pager.c @@ -51,8 +51,6 @@ _del_hook(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - evas_object_del(wd->clip); - evas_object_del(wd->rect); free(wd); } @@ -191,7 +189,6 @@ _move(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSE Item *it; if (!wd) return; evas_object_geometry_get(obj, &x, &y, NULL, NULL); - evas_object_move(wd->clip, x, y); EINA_LIST_FOREACH(wd->stack, l, it) evas_object_move(it->base, x, y); } @@ -220,22 +217,6 @@ _sub_del(void *data, Evas_Object *obj __UNUSED__, void *event_info) } static void -_show(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) -{ - Widget_Data *wd = elm_widget_data_get(data); - if (!wd) return; - evas_object_show(wd->clip); -} - -static void -_hide(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) -{ - Widget_Data *wd = elm_widget_data_get(data); - if (!wd) return; - evas_object_hide(wd->clip); -} - -static void _resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { Widget_Data *wd = elm_widget_data_get(data); @@ -244,7 +225,6 @@ _resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNU Item *it; if (!wd) return; evas_object_geometry_get(obj, NULL, NULL, &w, &h); - evas_object_resize(wd->clip, w, h); EINA_LIST_FOREACH(wd->stack, l, it) evas_object_resize(it->base, w, h); } @@ -293,20 +273,20 @@ elm_pager_add(Evas_Object *parent) elm_widget_can_focus_set(obj, EINA_FALSE); wd->clip = evas_object_rectangle_add(e); + elm_widget_resize_object_set(obj, wd->clip); + elm_widget_sub_object_add(obj, wd->clip); wd->rect = evas_object_rectangle_add(e); + elm_widget_sub_object_add(obj, wd->rect); evas_object_color_set(wd->rect, 255, 255, 255, 0); evas_object_clip_set(wd->rect, wd->clip); evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _move, obj); evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize, obj); - evas_object_event_callback_add(obj, EVAS_CALLBACK_SHOW, _show, obj); - evas_object_event_callback_add(obj, EVAS_CALLBACK_HIDE, _hide, obj); evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj); _sizing_eval(obj); - return obj; }