From 6282ede9d3e77c9af0cb41fabac05b9696ad86a3 Mon Sep 17 00:00:00 2001 From: JaeHyun Cho Date: Thu, 3 Jan 2013 04:10:45 +0000 Subject: [PATCH] elementary/naviframe - [E-devel][Patch] Fix _item_text_set_hook to set part text correctly Dear all, Hello. This is Jaehyun Cho. The current version of _item_text_set_hook sends the part signal name to edje_object_part_text_set. (elementary/src/lib/elc_naviframe.c) To resolve this issue, I sent different arguments to edje_object_part_text_set for each case. Please review this patch. Thank you, Jaehyun Cho. Signed-Off-By: JaeHyun Cho SVN revision: 82030 --- legacy/elementary/ChangeLog | 4 ++++ legacy/elementary/NEWS | 1 + legacy/elementary/src/lib/elc_naviframe.c | 5 +++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index b052790cc9..fc3ba4bbb9 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -866,3 +866,7 @@ 2012-12-29 Mike Blumenkrantz * Tooltips now correctly set NETWM tooltip window type + +2013-01-03 JaeHyun Jo (jae_hyun@cho@naver.com) + + * Fix the naviframe item part text to be set properly. diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index 61533badff..72fba9454d 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -107,6 +107,7 @@ Fixes: * Fix photocam returns file set error correctly. * Fix bug where genlist would delete items added during selection callback if a clear was queued * Tooltips now correctly set NETWM tooltip window type + * Fix the naviframe item part text to be set properly. Removals: diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c index cf3e873359..0bde7cb8ec 100644 --- a/legacy/elementary/src/lib/elc_naviframe.c +++ b/legacy/elementary/src/lib/elc_naviframe.c @@ -375,6 +375,7 @@ _item_text_set_hook(Elm_Object_Item *it, edje_object_signal_emit(VIEW(it), "elm,state,title_label,show", "elm"); else edje_object_signal_emit(VIEW(it), "elm,state,title_label,hide", "elm"); + edje_object_part_text_set(VIEW(it), buf, label); } else if (!strcmp("subtitle", part)) { @@ -384,6 +385,7 @@ _item_text_set_hook(Elm_Object_Item *it, edje_object_signal_emit(VIEW(it), "elm,state,subtitle,show", "elm"); else edje_object_signal_emit(VIEW(it), "elm,state,subtitle,hide", "elm"); + edje_object_part_text_set(VIEW(it), buf, label); } else { @@ -409,10 +411,9 @@ _item_text_set_hook(Elm_Object_Item *it, snprintf(buf, sizeof(buf), "elm,state,%s,hide", part); edje_object_signal_emit(VIEW(it), buf, "elm"); } + edje_object_part_text_set(VIEW(it), part, label); } - edje_object_part_text_set(VIEW(nit), buf, label); - /* access */ if (_elm_config->access_mode) _access_obj_process(nit, EINA_TRUE);