From: Enlightenment S. <no-...@en...> - 2011-10-12 12:19:37
|
Log: elementray/naviframe - renamed internal variable. removed useless lines. Author: hermet Date: 2011-10-12 05:19:31 -0700 (Wed, 12 Oct 2011) New Revision: 64019 Trac: http://trac.enlightenment.org/e/changeset/64019 Modified: trunk/elementary/src/lib/elc_naviframe.c Modified: trunk/elementary/src/lib/elc_naviframe.c =================================================================== --- trunk/elementary/src/lib/elc_naviframe.c 2011-10-12 12:19:00 UTC (rev 64018) +++ trunk/elementary/src/lib/elc_naviframe.c 2011-10-12 12:19:31 UTC (rev 64019) @@ -13,7 +13,7 @@ Evas_Object *rect; Eina_Bool preserve: 1; Eina_Bool auto_pushed: 1; - Eina_Bool pass_events: 1; + Eina_Bool freeze_events: 1; }; struct _Elm_Naviframe_Content_Item_Pair @@ -446,7 +446,7 @@ { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - if (wd->pass_events) + if (wd->freeze_events) evas_object_hide(wd->rect); } @@ -725,12 +725,8 @@ evas_object_smart_callback_call(it->base.widget, SIG_TRANSITION_FINISHED, (void *) EINA_TRUE); - if (wd->pass_events) - { - evas_object_hide(wd->rect); - //FIXME: - evas_object_pass_events_set(wd->base, EINA_FALSE); - } + if (wd->freeze_events) + evas_object_hide(wd->rect); } static void @@ -792,7 +788,7 @@ evas_object_smart_callbacks_descriptions_set(obj, _signals); wd->auto_pushed = EINA_TRUE; - wd->pass_events = EINA_TRUE; + wd->freeze_events = EINA_TRUE; return obj; } @@ -872,12 +868,8 @@ prev_it = ELM_CAST(elm_naviframe_top_item_get(obj)); if (prev_it) { - if (wd->pass_events) - { - evas_object_show(wd->rect); - //FIXME: - evas_object_pass_events_set(wd->base, EINA_TRUE); - } + if (wd->freeze_events) + evas_object_show(wd->rect); edje_object_signal_emit(prev_it->base.view, "elm,state,cur,pushed", "elm"); @@ -911,12 +903,8 @@ prev_it = ELM_CAST(elm_naviframe_top_item_get(obj)); if (prev_it) { - if (wd->pass_events) - { - evas_object_show(wd->rect); - //FIXME: - evas_object_pass_events_set(wd->base, EINA_TRUE); - } + if (wd->freeze_events) + evas_object_show(wd->rect); edje_object_signal_emit(it->base.view, "elm,state,cur,popped", "elm"); evas_object_show(prev_it->base.view); evas_object_raise(prev_it->base.view); @@ -1014,6 +1002,7 @@ Eina_List *l; Elm_Naviframe_Content_Item_Pair *content_pair; Elm_Naviframe_Text_Item_Pair *text_pair; + Widget_Data *wd; char buf[256]; @@ -1061,6 +1050,10 @@ navi_it->title_visible = EINA_TRUE; _item_sizing_eval(navi_it); + + wd = elm_widget_data_get(navi_it->base.widget); + if (wd && wd->freeze_events) + evas_object_hide(wd->rect); } EAPI const char * |