elementray/naviframe - renamed internal variable. removed useless lines.

SVN revision: 64019

diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index f8cae0e6ff03db2daa1e34f01956bc31ba827ba6..f820991217257135c375862112a9c9136c49a2ee 100644 (file)
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -13,7 +13,7 @@ struct _Widget_Data
    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 @@ _hide(void *data __UNUSED__,
 {
    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 @@ _show_finished(void *data,
    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 @@ elm_naviframe_add(Evas_Object *parent)
    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 @@ elm_naviframe_item_push(Evas_Object *obj,
    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 @@ elm_naviframe_item_pop(Evas_Object *obj)
    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 @@ elm_naviframe_item_style_set(Elm_Object_Item *it, const char *item_style)
    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 @@ elm_naviframe_item_style_set(Elm_Object_Item *it, const char *item_style)
 
    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 *