elm genlist: Fixed a bug with decorate all mode + tree effect. Delete tree effect...

[framework/uifw/elementary.git] / src / lib / elc_naviframe.c

diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index cc9767e..ab83da4 100644 (file)
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -220,7 +220,7 @@ static void _emit_hook(Evas_Object *obj,
 {
    Elm_Object_Item *it = elm_naviframe_top_item_get(obj);
    if (!it) return;
-   return elm_object_item_signal_emit(it, emission, source);
+   elm_object_item_signal_emit(it, emission, source);
 }
 
 static void
@@ -240,7 +240,7 @@ _item_text_set_hook(Elm_Object_Item *it,
 
    if (!part || !strcmp(part, "default"))
      snprintf(buf, sizeof(buf), "elm.text.title");
-   else if(!strcmp("subtitle", part))
+   else if (!strcmp("subtitle", part))
      snprintf(buf, sizeof(buf), "elm.text.subtitle");
    else
      snprintf(buf, sizeof(buf), "%s", part);
@@ -265,12 +265,12 @@ _item_text_set_hook(Elm_Object_Item *it,
 
    if (label)
      {
-        snprintf(buf, sizeof(buf), "elm,state,%s,show", buf);
+        snprintf(buf, sizeof(buf), "elm,state,%s,show", part);
         elm_object_signal_emit(VIEW(navi_it), buf, "elm");
      }
    else
      {
-        snprintf(buf, sizeof(buf), "elm,state,%s,hide", buf);
+        snprintf(buf, sizeof(buf), "elm,state,%s,hide", part);
         elm_object_signal_emit(VIEW(navi_it), buf, "elm");
      }
 
@@ -284,7 +284,7 @@ _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 
    if (!part || !strcmp(part, "default"))
      snprintf(buf, sizeof(buf), "elm.text.title");
-   else if(!strcmp("subtitle", part))
+   else if (!strcmp("subtitle", part))
      snprintf(buf, sizeof(buf), "elm.text.subtitle");
    else
      snprintf(buf, sizeof(buf), "%s", part);
@@ -1000,8 +1000,6 @@ _item_style_set(Elm_Naviframe_Item *navi_it, const char *item_style)
    if (navi_it->title_next_btn)
      elm_object_signal_emit(VIEW(navi_it), "elm,state,next_btn,show", "elm");
 
-// why does this forcibly enable title? isnt that separate to style?
-//   navi_it->title_visible = EINA_TRUE;
    _sizing_eval(WIDGET(navi_it));
 
    wd = elm_widget_data_get(WIDGET(navi_it));
@@ -1326,7 +1324,7 @@ elm_naviframe_item_pop_to(Elm_Object_Item *it)
 
    l = wd->stack->last->prev;
 
-   while(l)
+   while (l)
      {
         if (EINA_INLIST_CONTAINER_GET(l, Elm_Naviframe_Item) ==
             ((Elm_Naviframe_Item *)it)) break;
@@ -1448,6 +1446,7 @@ elm_naviframe_item_style_set(Elm_Object_Item *it, const char *item_style)
      if (!strcmp("basic", navi_it->style)) return;
 
    _item_style_set(navi_it, item_style);
+   _item_title_visible_update(navi_it);
 }
 
 EAPI const char *