forked from enlightenment/efl
elementary/naviframe - fixed logic.
when new content is coming, it needs to have some intialization. SVN revision: 66329
This commit is contained in:
parent
631ed501c5
commit
b3e0fbb730
|
@ -564,7 +564,7 @@ _title_content_set(Elm_Naviframe_Item *it,
|
||||||
|
|
||||||
if (pair)
|
if (pair)
|
||||||
{
|
{
|
||||||
if (pair->content && (pair->content != content))
|
if (pair->content != content)
|
||||||
{
|
{
|
||||||
if (content)
|
if (content)
|
||||||
{
|
{
|
||||||
|
@ -594,6 +594,9 @@ _title_content_set(Elm_Naviframe_Item *it,
|
||||||
eina_stringshare_replace(&pair->part, part);
|
eina_stringshare_replace(&pair->part, part);
|
||||||
it->content_list = eina_inlist_append(it->content_list,
|
it->content_list = eina_inlist_append(it->content_list,
|
||||||
EINA_INLIST_GET(pair));
|
EINA_INLIST_GET(pair));
|
||||||
|
}
|
||||||
|
if (pair->content != content)
|
||||||
|
{
|
||||||
elm_widget_sub_object_add(WIDGET(it), content);
|
elm_widget_sub_object_add(WIDGET(it), content);
|
||||||
evas_object_event_callback_add(content,
|
evas_object_event_callback_add(content,
|
||||||
EVAS_CALLBACK_DEL,
|
EVAS_CALLBACK_DEL,
|
||||||
|
@ -604,10 +607,10 @@ _title_content_set(Elm_Naviframe_Item *it,
|
||||||
_changed_size_hints,
|
_changed_size_hints,
|
||||||
WIDGET(it));
|
WIDGET(it));
|
||||||
}
|
}
|
||||||
edje_object_part_swallow(VIEW(it), part, content);
|
edje_object_part_swallow(VIEW(it), part, content);
|
||||||
snprintf(buf, sizeof(buf), "elm,state,%s,show", part);
|
snprintf(buf, sizeof(buf), "elm,state,%s,show", part);
|
||||||
edje_object_signal_emit(VIEW(it), buf, "elm");
|
edje_object_signal_emit(VIEW(it), buf, "elm");
|
||||||
pair->content = content;
|
pair->content = content;
|
||||||
|
|
||||||
_sizing_eval(WIDGET(it));
|
_sizing_eval(WIDGET(it));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue