[elm_navigationbar_ex]: nbeat implementation, to adjust for different sized title...
authorShilpa Singh <shilpa.singh@samsung.com>
Thu, 3 Mar 2011 11:31:23 +0000 (17:01 +0530)
committerShilpa Singh <shilpa.singh@samsung.com>
Thu, 3 Mar 2011 11:48:00 +0000 (17:18 +0530)
Change-Id: Ie4ccae67b777077c9765d60add1f616ddaa93dc2

src/lib/elm_navigationbar_ex.c

index be6bc2c..64f6706 100644 (file)
  *\r
  * Objects can be pushed or popped from the stack or deleted as normal.\r
  * Pushes and pops will animate and a pop will delete the object once the\r
- * animation is finished if delete_on_pop is set else the content is unset and the \r
- * content pointer is sent as event information in the hide,finished signal.  \r
+ * animation is finished if delete_on_pop is set else the content is unset and the\r
+ * content pointer is sent as event information in the hide,finished signal.\r
  * Any object in the Navigationbar_ex can be promoted to the top\r
  * (from its current stacking position) as well. Objects are pushed to the\r
  * top with elm_navigationbar_ex_item_push() and when the top item is no longer\r
  * wanted, simply pop it with elm_navigationbar_ex_item_pop() and it will also be\r
- * deleted/unset depending on delete_on_pop variable. \r
+ * deleted/unset depending on delete_on_pop variable.\r
  * Any object you wish to promote to the top that is already in the\r
  * navigationbar, simply use elm_navigationbar_ex_item_promote(). If an object is no longer\r
  * needed and is not the top item, just delete it as normal. You can query\r
@@ -40,7 +40,7 @@ struct _Widget_Data
 struct _Elm_Navigationbar_ex_Item\r
 {\r
    Evas_Object *obj, *base, *content;\r
-   Evas_Object *t_base, *ct_base;\r
+   Evas_Object *ct_base;\r
    Evas_Coord minw, minh;\r
    const char *title;\r
    const char *subtitle;\r
@@ -49,6 +49,7 @@ struct _Elm_Navigationbar_ex_Item
    Evas_Object *title_obj;\r
    Evas_Object *icon;\r
    Eina_Bool popme : 1;\r
+   Eina_Bool titleobj_visible:1;\r
 };\r
 \r
 struct _function_button\r
@@ -77,10 +78,10 @@ _content_unset(Elm_Navigationbar_ex_Item* item)
 {\r
    if (!item) return NULL;\r
    Evas_Object *content = NULL;\r
-   if (!item->content) return NULL; \r
+   if (!item->content) return NULL;\r
    content = item->content;\r
    elm_widget_sub_object_del(item->obj,item->content);\r
-   edje_object_part_unswallow(item->ct_base,item->content);     \r
+   edje_object_part_unswallow(item->ct_base,item->content);\r
    item->content = NULL;\r
    evas_object_hide(content);\r
    return content;\r
@@ -99,13 +100,12 @@ _theme_hook(Evas_Object *obj)
      {\r
         Eina_List *bl;\r
         fn_button *btn;\r
-        edje_object_scale_set(it->base, elm_widget_scale_get(obj) * \r
-                              _elm_config->scale);      \r
+        edje_object_scale_set(it->base, elm_widget_scale_get(obj) *\r
+                              _elm_config->scale);\r
         strncpy(buf, "item/", sizeof(buf));\r
         strncat(buf, it->item_style, sizeof(buf) - strlen(buf));\r
-        _elm_theme_object_set(obj, it->t_base,  "navigationbar_ex", buf, elm_widget_style_get(obj));\r
+        _elm_theme_object_set(obj, it->base,  "navigationbar_ex", buf, elm_widget_style_get(obj));\r
         _elm_theme_object_set(obj, it->ct_base,  "navigationbar_ex", "content", elm_widget_style_get(obj));\r
-        _elm_theme_object_set(obj, it->base,  "navigationbar_ex", "base", elm_widget_style_get(obj));\r
         EINA_LIST_FOREACH(it->fnbtn_list, bl, btn)\r
           {\r
              if (btn->btn_id == ELM_NAVIGATIONBAR_EX_BACK_BUTTON)\r
@@ -166,22 +166,21 @@ _eval_top(Evas_Object *obj)
      {\r
         Evas_Object *o, *o1, *o2;\r
         const char *onshow, *onhide;\r
-        \r
+\r
         if (wd->top)\r
           {\r
-             o = wd->top->base;\r
              o1 = wd->top->ct_base;\r
-             o2 = wd->top->t_base;/*make use of the signals sent for animation*/\r
+             o2 = wd->top->base;/*make use of the signals sent for animation*/\r
 \r
-             /*issue to fix, hide signal does not come for t_base, increasing time helps \r
+             /*issue to fix, hide signal does not come for t_base, increasing time helps\r
               in getting correct events in pop*/\r
              if (wd->disable_animation)\r
                {\r
                   edje_object_signal_emit(o2, "elm,action,hide,noanimate", "elm");\r
-                  edje_object_signal_emit(o1, "elm,action,hide,noanimate", "elm");                              \r
+                  edje_object_signal_emit(o1, "elm,action,hide,noanimate", "elm");\r
                }\r
              else if (wd->top->popme)\r
-               {        \r
+               {\r
                   edje_object_signal_emit(o2, "elm,action,pop", "elm");\r
                   edje_object_signal_emit(o1, "elm,action,pop", "elm");\r
                }\r
@@ -199,7 +198,7 @@ _eval_top(Evas_Object *obj)
                   }\r
                   else if (!strcmp(onhide, "lower")) {\r
                        evas_object_lower(o2);\r
-                       evas_object_lower(o1);                           \r
+                       evas_object_lower(o1);\r
                   }\r
                }\r
           }\r
@@ -209,17 +208,15 @@ _eval_top(Evas_Object *obj)
           }\r
         wd->oldtop = wd->top;\r
         wd->top = ittop;\r
-        o = wd->top->base;\r
         o1 = wd->top->ct_base;\r
-        o2 = wd->top->t_base;\r
-        evas_object_show(o);\r
+        o2 = wd->top->base;\r
         evas_object_show(o2);\r
         evas_object_show(o1);\r
-        \r
+\r
         if ((!animate)||(wd->disable_animation))\r
-          {     \r
+          {\r
              edje_object_signal_emit(o2, "elm,action,show,noanimate", "elm");\r
-             edje_object_signal_emit(o1, "elm,action,show,noanimate", "elm");                   \r
+             edje_object_signal_emit(o1, "elm,action,show,noanimate", "elm");\r
           }\r
         else if (wd->oldtop)\r
           {\r
@@ -228,7 +225,7 @@ _eval_top(Evas_Object *obj)
              if (wd->oldtop->popme)\r
                {\r
                   edje_object_signal_emit(o2, "elm,action,show", "elm");\r
-                  edje_object_signal_emit(o1, "elm,action,show", "elm");                                        \r
+                  edje_object_signal_emit(o1, "elm,action,show", "elm");\r
                }\r
              else\r
                {\r
@@ -296,7 +293,6 @@ _sub_del(void *data, Evas_Object *obj __UNUSED__, void *event_info)
              if (it->item_style) eina_stringshare_del(it->item_style);\r
              if (it->title_obj) evas_object_del(it->title_obj);\r
              if (it->icon) evas_object_del(it->icon);\r
-             evas_object_del(it->t_base);\r
              evas_object_del(it->ct_base);\r
              evas_object_del(it->base);\r
              _eval_top(it->obj);\r
@@ -308,7 +304,7 @@ _sub_del(void *data, Evas_Object *obj __UNUSED__, void *event_info)
 \r
 static void\r
 _resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)\r
-{   \r
+{\r
    Widget_Data *wd = elm_widget_data_get(data);\r
    Evas_Coord w, h;\r
    Eina_List *l;\r
@@ -324,13 +320,12 @@ _signal_hide_finished(void *data, Evas_Object *obj __UNUSED__, const char *emiss
    Elm_Navigationbar_ex_Item *it = data;\r
    Evas_Object *obj2 = it->obj;\r
    Widget_Data *wd = elm_widget_data_get(it->obj);\r
-   evas_object_hide(it->t_base);\r
    evas_object_hide(it->ct_base);\r
    evas_object_hide(it->base);\r
-   edje_object_signal_emit(it->t_base, "elm,action,reset", "elm");\r
+   edje_object_signal_emit(it->base, "elm,action,reset", "elm");\r
    edje_object_signal_emit(it->ct_base, "elm,action,reset", "elm");\r
    evas_object_smart_callback_call(obj2, "hide,finished", it->content);\r
-   edje_object_message_signal_process(it->t_base);       \r
+   edje_object_message_signal_process(it->base);\r
    edje_object_message_signal_process(it->ct_base);\r
    if (it->popme)\r
      {\r
@@ -346,7 +341,7 @@ _signal_hide_finished(void *data, Evas_Object *obj __UNUSED__, const char *emiss
    _sizing_eval(obj2);\r
 }\r
 \r
-static void \r
+static void\r
 _item_promote(Elm_Navigationbar_ex_Item* item)\r
 {\r
    if (!item) return;\r
@@ -369,8 +364,8 @@ _item_promote(Elm_Navigationbar_ex_Item* item)
 static void\r
 _process_deletions(Widget_Data *wd)\r
 {\r
-   if (!wd) return;     \r
-   Elm_Navigationbar_ex_Item *it;       \r
+   if (!wd) return;\r
+   Elm_Navigationbar_ex_Item *it;\r
    fn_button *btn_data;\r
    Eina_List *list;\r
    EINA_LIST_FREE(wd->to_delete, it)\r
@@ -386,16 +381,33 @@ _process_deletions(Widget_Data *wd)
              free(btn_data);\r
              btn_data = NULL;\r
           }\r
-        if (it->title_obj) evas_object_del(it->title_obj);              \r
+        if (it->title_obj) evas_object_del(it->title_obj);\r
         if (it->content)  evas_object_del(it->content);\r
         if (it->icon) evas_object_del(it->icon);\r
-        evas_object_del(it->t_base);\r
         evas_object_del(it->ct_base);\r
         evas_object_del(it->base);\r
         _eval_top(it->obj);\r
         free(it);\r
         it = NULL;\r
-     }  \r
+     }\r
+}\r
+\r
+static void\r
+_show_hide_titleobj(void *data, Evas_Object *obj , const char *emission, const char *source)\r
+{\r
+   Elm_Navigationbar_ex_Item *item = (Elm_Navigationbar_ex_Item *)data;\r
+   if(!item) return;\r
+   if(!item->title_obj) return;\r
+   if(!item->titleobj_visible)\r
+     {\r
+       edje_object_signal_emit(item->base, "elm,state,show,title", "elm");\r
+       item->titleobj_visible = EINA_TRUE;\r
+     }\r
+   else\r
+     {\r
+       edje_object_signal_emit(item->base, "elm,state,hide,title", "elm");\r
+       item->titleobj_visible = EINA_FALSE;\r
+     }\r
 }\r
 \r
 /**\r
@@ -414,7 +426,7 @@ elm_navigationbar_ex_add(Evas_Object *parent)
    Widget_Data *wd;\r
 \r
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);\r
-   \r
+\r
    wd = ELM_NEW(Widget_Data);\r
    e = evas_object_evas_get(parent);\r
    obj = elm_widget_add(e);\r
@@ -428,15 +440,15 @@ elm_navigationbar_ex_add(Evas_Object *parent)
    wd->clip = evas_object_rectangle_add(e);\r
    elm_widget_resize_object_set(obj, wd->clip);\r
    elm_widget_sub_object_add(obj, wd->clip);\r
-   \r
+\r
    wd->rect = evas_object_rectangle_add(e);\r
    elm_widget_sub_object_add(obj, wd->rect);\r
-   evas_object_color_set(wd->rect, 255, 255, 255, 0); \r
+   evas_object_color_set(wd->rect, 255, 255, 255, 0);\r
    evas_object_clip_set(wd->rect, wd->clip);\r
-   \r
+\r
    evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _move, obj);\r
    evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize, obj);\r
-   \r
+\r
    evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);\r
    wd->del_on_pop = EINA_TRUE;\r
    _sizing_eval(obj);\r
@@ -472,36 +484,31 @@ elm_navigationbar_ex_item_push(Evas_Object *obj, Evas_Object *content, const cha
    it->content = content;\r
    it->base = edje_object_add(evas_object_evas_get(obj));\r
    it->ct_base = edje_object_add(evas_object_evas_get(obj));\r
-   it->t_base = edje_object_add(evas_object_evas_get(obj));\r
 \r
    evas_object_smart_member_add(it->base, obj);\r
    evas_object_smart_member_add(it->ct_base, obj);\r
-   evas_object_smart_member_add(it->t_base, obj);\r
-         \r
+\r
    evas_object_geometry_get(obj, &x, &y, &w, &h);\r
    evas_object_move(it->base, x, y);\r
    evas_object_resize(it->base, w, h);\r
    evas_object_clip_set(it->base, wd->clip);\r
-   \r
+\r
    elm_widget_sub_object_add(obj, it->base);\r
    elm_widget_sub_object_add(obj, it->ct_base);\r
-   elm_widget_sub_object_add(obj, it->t_base);\r
-   \r
+\r
    elm_widget_sub_object_add(obj, it->content);\r
-   \r
-   _elm_theme_object_set(obj, it->base,  "navigationbar_ex", "base", elm_widget_style_get(obj));\r
+\r
    _elm_theme_object_set(obj, it->ct_base,  "navigationbar_ex", "content", elm_widget_style_get(obj));\r
 \r
    strncpy(buf, "item/", sizeof(buf));\r
    strncat(buf, item_style, sizeof(buf) - strlen(buf));\r
    if (!eina_stringshare_replace(&it->item_style, item_style)) return NULL;\r
-   _elm_theme_object_set(obj, it->t_base,  "navigationbar_ex", buf, elm_widget_style_get(obj));\r
-   \r
-   \r
-   edje_object_part_swallow(it->base, "elm.swallow.title", it->t_base);\r
+   _elm_theme_object_set(obj, it->base,  "navigationbar_ex", buf, elm_widget_style_get(obj));\r
+\r
+\r
    edje_object_part_swallow(it->base, "elm.swallow.content", it->ct_base);\r
-   \r
-   edje_object_signal_callback_add(it->ct_base, "elm,action,hide,finished", "", \r
+\r
+   edje_object_signal_callback_add(it->ct_base, "elm,action,hide,finished", "",\r
                                    _signal_hide_finished, it);\r
    evas_object_event_callback_add(it->content,\r
                                   EVAS_CALLBACK_CHANGED_SIZE_HINTS,\r
@@ -518,7 +525,7 @@ elm_navigationbar_ex_item_push(Evas_Object *obj, Evas_Object *content, const cha
 \r
 /**\r
  * Set the title string for the pushed Item.\r
- * @param[in] item The Navigationbar_ex Item \r
+ * @param[in] item The Navigationbar_ex Item\r
  * @param[in] title The title string\r
  *\r
  * @ingroup Navigationbar_ex\r
@@ -528,13 +535,9 @@ elm_navigationbar_ex_item_title_label_set( Elm_Navigationbar_ex_Item* item, cons
 {\r
    if (!item) return;\r
    if (!eina_stringshare_replace(&item->title, title)) return;\r
-   if (item->t_base)\r
+   if (item->base)\r
      {\r
-        if ((item->title_obj) && (item->title))\r
-          {\r
-             edje_object_signal_emit(item->base, "elm,state,extend,title", "elm");\r
-          }     \r
-        edje_object_part_text_set(item->t_base, "elm.text", item->title);       \r
+        edje_object_part_text_set(item->base, "elm.text", item->title);\r
      }\r
 }\r
 \r
@@ -556,18 +559,18 @@ elm_navigationbar_ex_item_title_label_get(Elm_Navigationbar_ex_Item* item)
 /**\r
  * Set the sub title string for the pushed content\r
  *\r
- * @param[in] item The Navigationbar_ex Item \r
+ * @param[in] item The Navigationbar_ex Item\r
  * @param[in] subtitle The subtitle string\r
  *\r
  * @ingroup Navigationbar_ex\r
  */\r
-EAPI void \r
+EAPI void\r
 elm_navigationbar_ex_item_subtitle_label_set( Elm_Navigationbar_ex_Item* item, const char *subtitle)\r
 {\r
    if (!item) return;\r
    if (!eina_stringshare_replace(&item->subtitle, subtitle)) return;\r
-   if (item->t_base)\r
-     edje_object_part_text_set(item->t_base, "elm.text.sub", item->subtitle);   \r
+   if (item->base)\r
+     edje_object_part_text_set(item->base, "elm.text.sub", item->subtitle);\r
 }\r
 \r
 /**\r
@@ -587,28 +590,28 @@ elm_navigationbar_ex_item_subtitle_label_get(Elm_Navigationbar_ex_Item* item)
 \r
 /**\r
  * Set's the icon object of the pushed content\r
- *  \r
+ *\r
  * @param[in] item The Navigationbar_ex Item\r
  * @param[in] The icon object or NULL if none\r
- *  \r
+ *\r
  *@ingroup Navigationbar_ex\r
  */\r
 EAPI void\r
 elm_navigationbar_ex_item_icon_set(Elm_Navigationbar_ex_Item* item, Evas_Object *icon)\r
 {\r
-   if (!item) return; \r
+   if (!item) return;\r
    if (item->icon == icon) return;\r
    if (item->icon) evas_object_del(item->icon);\r
    item->icon = icon;\r
    if(icon)\r
      {\r
-        edje_object_part_swallow(item->t_base, "elm.swallow.icon", icon);\r
+        edje_object_part_swallow(item->base, "elm.swallow.icon", icon);\r
         elm_widget_sub_object_add(item->obj, icon);\r
-        edje_object_signal_emit(item->t_base, "elm,state,icon,visible", "elm");\r
-        edje_object_message_signal_process(item->t_base);\r
+        edje_object_signal_emit(item->base, "elm,state,icon,visible", "elm");\r
+        edje_object_message_signal_process(item->base);\r
      }\r
    else\r
-     edje_object_signal_emit(item->t_base, "elm,state,icon,hidden", "elm");\r
+     edje_object_signal_emit(item->base, "elm,state,icon,hidden", "elm");\r
 }\r
 \r
 /**\r
@@ -616,13 +619,13 @@ elm_navigationbar_ex_item_icon_set(Elm_Navigationbar_ex_Item* item, Evas_Object
  *\r
  * @param[in] item The Navigationbar_ex Item\r
  * @return The icon object or NULL if none\r
- * \r
+ *\r
  * @ingroup Navigationbar_ex\r
  */\r
 EAPI Evas_Object *\r
 elm_navigationbar_ex_item_icon_get(Elm_Navigationbar_ex_Item* item)\r
 {\r
-   if (!item) return NULL; \r
+   if (!item) return NULL;\r
    return item->icon;\r
 }\r
 \r
@@ -630,7 +633,7 @@ elm_navigationbar_ex_item_icon_get(Elm_Navigationbar_ex_Item* item)
 /**\r
  * Set the button object of the pushed content\r
  *\r
- * @param[in] item The Navigationbar_ex Item \r
+ * @param[in] item The Navigationbar_ex Item\r
  * @param[in] btn_label The button label\r
  * @param[in] icon The button icon\r
  * @param[in] button_type Indicates the position[use macros of type Elm_Navi_ex_Button_Type\r
@@ -638,7 +641,7 @@ elm_navigationbar_ex_item_icon_get(Elm_Navigationbar_ex_Item* item)
  * @param[in] func Callback function called when button is clicked.\r
  * @param[in] data Callback data that would be sent when button is clicked.\r
  * @ingroup Navigationbar_ex\r
- */ \r
+ */\r
 EAPI void\r
 elm_navigationbar_ex_item_title_button_set(Elm_Navigationbar_ex_Item* item, char *btn_label, Evas_Object *icon, int button_type, Evas_Smart_Cb func, const void *data)\r
 {\r
@@ -656,7 +659,7 @@ elm_navigationbar_ex_item_title_button_set(Elm_Navigationbar_ex_Item* item, char
              btn_det = NULL;\r
              item->fnbtn_list = eina_list_remove_list(item->fnbtn_list, bl);\r
           }\r
-     }  \r
+     }\r
    btn = elm_button_add(item->obj);\r
    btn_det = ELM_NEW(btn_det);\r
    if (!btn_det) return;\r
@@ -669,26 +672,26 @@ elm_navigationbar_ex_item_title_button_set(Elm_Navigationbar_ex_Item* item, char
    else\r
      {\r
         snprintf(theme, sizeof(theme), "navigationbar_functionbutton/%s", elm_widget_style_get(item->obj));\r
-        elm_object_style_set(btn, theme);                                       \r
+        elm_object_style_set(btn, theme);\r
         snprintf(buf, sizeof(buf), "elm.swallow.btn%d", button_type);\r
      }\r
    if (btn_label)\r
      elm_button_label_set(btn, btn_label);\r
    if (icon)\r
      elm_button_icon_set(btn, icon);\r
-   elm_object_focus_allow_set(btn, EINA_FALSE); \r
+   elm_object_focus_allow_set(btn, EINA_FALSE);\r
    evas_object_smart_callback_add(btn, "clicked", func, data);\r
-   edje_object_part_swallow(item->t_base, buf, btn);\r
+   edje_object_part_swallow(item->base, buf, btn);\r
    elm_widget_sub_object_add(item->obj, btn);\r
    btn_det->btn = btn;\r
    btn_det->btn_id = button_type;\r
-   item->fnbtn_list = eina_list_append(item->fnbtn_list, btn_det);              \r
+   item->fnbtn_list = eina_list_append(item->fnbtn_list, btn_det);\r
 }\r
 \r
 /**\r
  * Return the button object of the pushed content\r
  *\r
- * @param[in] item The Navigationbar_ex Item \r
+ * @param[in] item The Navigationbar_ex Item\r
  * @param[in] button_type Indicates the position\r
  * @return The button object or NULL if none\r
  *\r
@@ -705,13 +708,13 @@ elm_navigationbar_ex_item_title_button_get(Elm_Navigationbar_ex_Item* item, int
         if (btn_det->btn_id == button_type)\r
           return btn_det->btn;\r
      }\r
-   return NULL;                 \r
+   return NULL;\r
 }\r
 \r
 /**\r
  * Unset the button object of the pushed content\r
  *\r
- * @param[in] item The Navigationbar_ex Item \r
+ * @param[in] item The Navigationbar_ex Item\r
  * @param[in] button_type Indicates the position\r
  * @return The button object or NULL if none\r
  *\r
@@ -730,18 +733,18 @@ elm_navigationbar_ex_item_title_button_unset(Elm_Navigationbar_ex_Item* item, in
           {\r
              btn_ret = btn_det->btn;\r
              elm_widget_sub_object_del(item->obj,btn_det->btn);\r
-             edje_object_part_unswallow(item->t_base,btn_det->btn);     \r
+             edje_object_part_unswallow(item->base,btn_det->btn);\r
              item->fnbtn_list = eina_list_remove_list(item->fnbtn_list, bl);\r
              btn_det->btn = NULL;\r
              return btn_ret;\r
           }\r
      }\r
-   return NULL;                 \r
+   return NULL;\r
 }\r
 \r
 /**\r
- * Sets a title object for the Item \r
- * @param[in] item The Navigationbar_ex Item \r
+ * Sets a title object for the Item\r
+ * @param[in] item The Navigationbar_ex Item\r
  * @param[in] title_obj Title object (normally segment_control/searchbar)\r
  *\r
  * @ingroup Navigationbar_ex\r
@@ -754,19 +757,17 @@ elm_navigationbar_ex_item_title_object_set(Elm_Navigationbar_ex_Item* item, Evas
    item->title_obj = title_obj;\r
    if (title_obj)\r
      {\r
-        if ((item->title_obj) && (item->title))\r
-          {\r
-             edje_object_signal_emit(item->base, "elm,state,extend,title", "elm");\r
-          }                     \r
         elm_widget_sub_object_add(item->obj,title_obj);\r
-        edje_object_part_swallow(item->t_base, "elm.swallow.title", title_obj);\r
+        edje_object_part_swallow(item->base, "elm.swallow.title", title_obj);\r
+        edje_object_signal_callback_add(item->base, "elm,action,clicked", "elm",\r
+                                        _show_hide_titleobj, item);\r
      }\r
    _sizing_eval(item->obj);\r
 }\r
 \r
 /**\r
  * Hides the title area of the item.\r
- * @param[in] item The Navigationbar_ex Item \r
+ * @param[in] item The Navigationbar_ex Item\r
  * @param[in] hidden if EINA_TRUE the title area is hidden else its shown.\r
  *\r
  * @ingroup Navigationbar_ex\r
@@ -785,7 +786,7 @@ elm_navigationbar_ex_item_title_hidden_set(Elm_Navigationbar_ex_Item* item, Eina
  * Unsets a title object for the item, the return object has to be deleted\r
  * by application if not added again in to navigationbar.\r
  *\r
- * @param[in] item The Navigationbar_ex Item \r
+ * @param[in] item The Navigationbar_ex Item\r
  * @return The title object or NULL if none is set\r
  *\r
  * @ingroup Navigationbar_ex\r
@@ -795,10 +796,10 @@ elm_navigationbar_ex_item_title_object_unset(Elm_Navigationbar_ex_Item* item)
 {\r
    if (!item) return NULL;\r
    Evas_Object *title_obj=NULL;\r
-   if (!item->title_obj) return NULL; \r
+   if (!item->title_obj) return NULL;\r
    title_obj = item->title_obj;\r
    elm_widget_sub_object_del(item->obj,item->title_obj);\r
-   edje_object_part_unswallow(item->t_base,item->title_obj);    \r
+   edje_object_part_unswallow(item->base,item->title_obj);\r
    item->title_obj = NULL;\r
    return title_obj;\r
 }\r
@@ -806,7 +807,7 @@ elm_navigationbar_ex_item_title_object_unset(Elm_Navigationbar_ex_Item* item)
 /**\r
  * Returns the title object of the pushed content.\r
  *\r
- * @param[in] item The Navigationbar_ex Item \r
+ * @param[in] item The Navigationbar_ex Item\r
  * @return The title object or NULL if none is set\r
  *\r
  * @ingroup Navigationbar_ex\r
@@ -821,11 +822,11 @@ elm_navigationbar_ex_item_title_object_get(Elm_Navigationbar_ex_Item* item)
 \r
 /**\r
  * Unsets the content of the item, the return object has to be deleted\r
- * by application if not added again in to navigationbar, when the content \r
- * is unset the corresponding item would be deleted, when this content is pushed again \r
+ * by application if not added again in to navigationbar, when the content\r
+ * is unset the corresponding item would be deleted, when this content is pushed again\r
  * a new item would be created again.\r
  *\r
- * @param[in] item The Navigationbar_ex Item \r
+ * @param[in] item The Navigationbar_ex Item\r
  * @return The content object or NULL if none is set\r
  *\r
  * @ingroup Navigationbar_ex\r
@@ -841,7 +842,7 @@ elm_navigationbar_ex_item_content_unset(Elm_Navigationbar_ex_Item* item)
 /**\r
  * Returns the content of the item.\r
  *\r
- * @param[in] item The Navigationbar_ex Item \r
+ * @param[in] item The Navigationbar_ex Item\r
  * @return The content object or NULL if none is set\r
  *\r
  * @ingroup Navigationbar_ex\r
@@ -858,23 +859,23 @@ elm_navigationbar_ex_item_content_get(Elm_Navigationbar_ex_Item* item)
  * if false the item is not deleted but only removed from the stack\r
  * the pointer of the content is sent along with hide,finished signal.\r
  *\r
- * @param[in] obj The Navigationbar_ex object. \r
+ * @param[in] obj The Navigationbar_ex object.\r
  * @param[in] del_on_pop if set the content is deleted on pop else unset, by default the value is EINA_TRUE.\r
  *\r
  * @ingroup Navigationbar_ex\r
  */\r
-EAPI void \r
+EAPI void\r
 elm_navigationbar_ex_delete_on_pop_set(Evas_Object *obj, Eina_Bool del_on_pop)\r
 {\r
    ELM_CHECK_WIDTYPE(obj, widtype);\r
    Widget_Data *wd = elm_widget_data_get(obj);\r
    if (!wd) return;\r
-   wd->del_on_pop = del_on_pop; \r
+   wd->del_on_pop = del_on_pop;\r
 }\r
 \r
 /**\r
- * Sets the style of the navigationbar item. \r
- * @param[in] item The Navigationbar_ex Item \r
+ * Sets the style of the navigationbar item.\r
+ * @param[in] item The Navigationbar_ex Item\r
  * @param[in] item_style Navigationbar Item style, this can be used when the style of the item has to be dynamically set.\r
  *\r
  * @ingroup Navigationbar_ex\r
@@ -891,11 +892,11 @@ elm_navigationbar_ex_item_style_set(Elm_Navigationbar_ex_Item* item, const char*
    strncpy(buf, "item/", sizeof(buf));\r
    strncat(buf, item_style, sizeof(buf) - strlen(buf));\r
    if (!eina_stringshare_replace(&item->item_style, item_style)) return;\r
-   _elm_theme_object_set(item->obj, item->t_base,  "navigationbar_ex", buf, elm_widget_style_get(item->obj));\r
+   _elm_theme_object_set(item->obj, item->base,  "navigationbar_ex", buf, elm_widget_style_get(item->obj));\r
    if (item->title)\r
-     edje_object_part_text_set(item->t_base, "elm.text", item->title);\r
+     edje_object_part_text_set(item->base, "elm.text", item->title);\r
    if (item->subtitle)\r
-     edje_object_part_text_set(item->t_base, "elm.text.sub", item->subtitle);\r
+     edje_object_part_text_set(item->base, "elm.text.sub", item->subtitle);\r
    if (item->fnbtn_list)\r
      {\r
         EINA_LIST_FOREACH(item->fnbtn_list, bl, btn_det)\r
@@ -917,12 +918,12 @@ elm_navigationbar_ex_item_style_set(Elm_Navigationbar_ex_Item* item, const char*
 /**\r
  * Returns the style of the item.\r
  *\r
- * @param[in] item The Navigationbar_ex Item \r
+ * @param[in] item The Navigationbar_ex Item\r
  * @return The item style.\r
  *\r
  * @ingroup Navigationbar_ex\r
  */\r
-EAPI const char* \r
+EAPI const char*\r
 elm_navigationbar_ex_item_style_get(Elm_Navigationbar_ex_Item* item)\r
 {\r
    if (!item) return NULL;\r
@@ -944,7 +945,7 @@ EAPI void
 elm_navigationbar_ex_item_promote(Elm_Navigationbar_ex_Item* item)\r
 {\r
    if (!item) return NULL;\r
-   _item_promote(item);  \r
+   _item_promote(item);\r
 }\r
 \r
 /**\r
@@ -955,7 +956,7 @@ elm_navigationbar_ex_item_promote(Elm_Navigationbar_ex_Item* item)
  *\r
  * @ingroup Navigationbar_ex\r
  */\r
-EAPI void \r
+EAPI void\r
 elm_navigationbar_ex_to_item_pop(Elm_Navigationbar_ex_Item* item)\r
 {\r
    if (!item) return;\r
@@ -979,19 +980,19 @@ elm_navigationbar_ex_to_item_pop(Elm_Navigationbar_ex_Item* item)
                }\r
              else\r
                break;\r
-             \r
+\r
              list = list->prev;\r
           }\r
-     }  \r
+     }\r
    _eval_top(it->obj);\r
    if (wd->to_delete)\r
      _process_deletions(wd);\r
 }\r
 \r
 /**\r
- * Pop the object that is on top of the Navigationbar_ex stack \r
+ * Pop the object that is on top of the Navigationbar_ex stack\r
  * This pops the object that is on top (visible) in the navigationbar, makes it disappear, then deletes/unsets the object\r
- * based on del_on_pop variable. \r
+ * based on del_on_pop variable.\r
  * The object that was underneath it on the stack will become visible.\r
  *\r
  * @param[in] obj The Navigationbar_ex object\r
@@ -1015,25 +1016,25 @@ elm_navigationbar_ex_item_pop(Evas_Object *obj)
         ll = ll->prev;\r
         if (!ll)\r
           {\r
-             \r
+\r
              Evas_Object *o, *o2;\r
              const char *onhide;\r
-             \r
+\r
              wd->top = it;\r
              o = wd->top->ct_base;\r
-             o2 = wd->top->t_base;       \r
-             \r
+             o2 = wd->top->base;\r
+\r
              edje_object_signal_emit(o2, "elm,action,pop", "elm");\r
              edje_object_signal_emit(o, "elm,action,pop", "elm");\r
              onhide = edje_object_data_get(o, "onhide");\r
              if (onhide)\r
                {\r
-                  if (!strcmp(onhide, "raise")) \r
+                  if (!strcmp(onhide, "raise"))\r
                     {\r
                        evas_object_raise(o2);\r
                        evas_object_raise(o);\r
                     }\r
-                  else if (!strcmp(onhide, "lower")) \r
+                  else if (!strcmp(onhide, "lower"))\r
                     {\r
                        evas_object_lower(o2);\r
                        evas_object_lower(o);\r