From: ChunEon Park Date: Tue, 7 Sep 2010 12:39:10 +0000 (+0900) Subject: [elm_ctxpopup.c] updated scroller X-Git-Tag: origin~268 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6365635f04571e26eee9cd1071059baa35404ec4;p=framework%2Fuifw%2Felementary.git [elm_ctxpopup.c] updated scroller --- diff --git a/src/lib/elm_ctxpopup.c b/src/lib/elm_ctxpopup.c index 94dffa3..88e8d3f 100644 --- a/src/lib/elm_ctxpopup.c +++ b/src/lib/elm_ctxpopup.c @@ -623,7 +623,7 @@ _theme_hook(Evas_Object *obj) _elm_theme_object_set(obj, wd->arrow, "ctxpopup", "arrow", elm_widget_style_get(obj)); - //elm_object_style_set(wd->scroller, elm_widget_style_get(obj)); + elm_object_style_set(wd->scroller, "ctxpopup"); _sizing_eval(obj); @@ -858,10 +858,10 @@ elm_ctxpopup_add(Evas_Object *parent) //Scroller wd->scroller = elm_scroller_add(obj); - elm_object_style_set(wd->scroller, "vertical"); + elm_object_style_set(wd->scroller, "ctxpopup"); elm_scroller_content_min_limit(wd->scroller, EINA_TRUE, EINA_TRUE); - elm_scroller_policy_set(wd->scroller, ELM_SCROLLER_POLICY_OFF, - ELM_SCROLLER_POLICY_ON); + elm_scroller_policy_set(wd->scroller, ELM_SCROLLER_POLICY_AUTO, + ELM_SCROLLER_POLICY_AUTO); elm_scroller_bounce_set(wd->scroller, EINA_FALSE, EINA_TRUE); edje_object_part_swallow(wd->base, "elm.swallow.scroller", wd->scroller); evas_object_event_callback_add(wd->scroller, EVAS_CALLBACK_RESIZE, @@ -949,21 +949,15 @@ elm_ctxpopup_horizontal_set(Evas_Object *obj, Eina_Bool horizontal) wd->horizontal = horizontal; if (!horizontal) { - elm_object_style_set(wd->scroller, "vertical"); elm_box_horizontal_set(wd->box, EINA_FALSE); elm_scroller_bounce_set(wd->scroller, EINA_FALSE, EINA_TRUE); - elm_scroller_policy_set(wd->scroller, ELM_SCROLLER_POLICY_ON, - ELM_SCROLLER_POLICY_OFF); EINA_LIST_FOREACH(wd->items, elist, item) edje_object_signal_emit(item->base, "elm,state,vertical", "elm"); } else { - elm_object_style_set(wd->scroller, "horizontal"); elm_box_horizontal_set(wd->box, EINA_TRUE); elm_scroller_bounce_set(wd->scroller, EINA_TRUE, EINA_FALSE); - elm_scroller_policy_set(wd->scroller, ELM_SCROLLER_POLICY_ON, - ELM_SCROLLER_POLICY_OFF); EINA_LIST_FOREACH(wd->items, elist, item) edje_object_signal_emit(item->base, "elm,state,horizontal", "elm"); }