summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2011-12-19 11:13:06 +0000
committerChunEon Park <hermet@hermet.pe.kr>2011-12-19 11:13:06 +0000
commit2329189d72642e204c178c976d354d58ed26cda7 (patch)
treefd250b86e1815cd746a8ebded9c10ca752d1c780
parent95e06e56e25afe6051c9faf5dc1d678e0100314a (diff)
elementary/naviframe - fixed logic.
when new content is coming, it needs to have some intialization. SVN revision: 66329
-rw-r--r--src/lib/elc_naviframe.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 5f4527bb5..9177321f6 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -564,7 +564,7 @@ _title_content_set(Elm_Naviframe_Item *it,
564 564
565 if (pair) 565 if (pair)
566 { 566 {
567 if (pair->content && (pair->content != content)) 567 if (pair->content != content)
568 { 568 {
569 if (content) 569 if (content)
570 { 570 {
@@ -594,6 +594,9 @@ _title_content_set(Elm_Naviframe_Item *it,
594 eina_stringshare_replace(&pair->part, part); 594 eina_stringshare_replace(&pair->part, part);
595 it->content_list = eina_inlist_append(it->content_list, 595 it->content_list = eina_inlist_append(it->content_list,
596 EINA_INLIST_GET(pair)); 596 EINA_INLIST_GET(pair));
597 }
598 if (pair->content != content)
599 {
597 elm_widget_sub_object_add(WIDGET(it), content); 600 elm_widget_sub_object_add(WIDGET(it), content);
598 evas_object_event_callback_add(content, 601 evas_object_event_callback_add(content,
599 EVAS_CALLBACK_DEL, 602 EVAS_CALLBACK_DEL,
@@ -604,10 +607,10 @@ _title_content_set(Elm_Naviframe_Item *it,
604 _changed_size_hints, 607 _changed_size_hints,
605 WIDGET(it)); 608 WIDGET(it));
606 } 609 }
607 edje_object_part_swallow(VIEW(it), part, content); 610 edje_object_part_swallow(VIEW(it), part, content);
608 snprintf(buf, sizeof(buf), "elm,state,%s,show", part); 611 snprintf(buf, sizeof(buf), "elm,state,%s,show", part);
609 edje_object_signal_emit(VIEW(it), buf, "elm"); 612 edje_object_signal_emit(VIEW(it), buf, "elm");
610 pair->content = content; 613 pair->content = content;
611 614
612 _sizing_eval(WIDGET(it)); 615 _sizing_eval(WIDGET(it));
613} 616}