dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

naviframe: subtitle,show signal not sent 

Summary:
1. When subtitle is set using actual part name "elm.text.subtitle",
subtitle,show signal is not sent issue fix.
2. Remove unnecessary checks, maintain code readability.

@fix

Test Plan:
Set text using edc part name elm.text.subtitle

Reviewers: Hermet, cedric

Reviewed By: cedric

Subscribers: shashank0990

Differential Revision: https://phab.enlightenment.org/D2988

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
Shilpa Singh 2015-11-09 14:34:37 -08:00 committed by Cedric BAIL
parent 41bfc98606
commit f1f1ed290c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
legacy/elementary/src/lib/elc_naviframe.c
View File

@ -469,7 +469,7 @@ _elm_naviframe_item_elm_widget_item_part_text_set(Eo *eo_it EINA_UNUSED,
elm_object_signal_emit(VIEW(it), "elm,state,title_label,hide", "elm");
elm_object_part_text_set(VIEW(it), TITLE_PART, label);
}
else if (!strcmp("subtitle", part))
else if ((!strcmp(part, "subtitle")) || (!strcmp(part, SUBTITLE_PART)))
{
eina_stringshare_replace(&nit->subtitle_label, label);
if (label)
@ -730,7 +730,7 @@ _item_title_icon_unset(Elm_Naviframe_Item_Data *it)
static void
_part_aliasing_eval(const char **part)
{
if (!*part || !strcmp("default", *part))
if (!*part || !strcmp(*part, "default"))
*part = CONTENT_PART;
else if (!strcmp(*part, "prev_btn"))
*part = PREV_BTN_PART;
@ -811,7 +811,7 @@ _elm_naviframe_item_elm_widget_item_part_content_set(Eo *eo_nit EINA_UNUSED,
_part_aliasing_eval(&part);
//specified parts
if (!part || !strcmp(CONTENT_PART, part))
if (!strcmp(part, CONTENT_PART))
_item_content_set(nit, content);
else if (!strcmp(part, PREV_BTN_PART))
_item_title_prev_btn_set(nit, content);
@ -833,7 +833,7 @@ _elm_naviframe_item_elm_widget_item_part_content_get(Eo *eo_nit EINA_UNUSED,
_part_aliasing_eval(&part);
//specified parts
if (!part || !strcmp(CONTENT_PART, part))
if (!strcmp(part, CONTENT_PART))
return nit->content;
else if (!strcmp(part, PREV_BTN_PART))
return nit->title_prev_btn;
@ -887,7 +887,7 @@ _elm_naviframe_item_elm_widget_item_part_content_unset(Eo *eo_nit EINA_UNUSED,
_part_aliasing_eval(&part);
//specified parts
if (!part || !strcmp(CONTENT_PART, part))
if (!strcmp(part, CONTENT_PART))
o = _item_content_unset(nit);
else if (!strcmp(part, PREV_BTN_PART))
o = _item_title_prev_btn_unset(nit);