tasn pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=534610bdecfd7b8f283f94918ff152841e1626cc
commit 534610bdecfd7b8f283f94918ff152841e1626cc Author: Tom Hacohen <[email protected]> Date: Fri Jan 24 17:35:37 2014 +0000 Revert "[naviframe] Fix to hide the previous view by emitting signal" This breaks elementary_config (open it and you'll see the weird bugs on the top left corner). Please fix it and recommit as needed. I have no time to dive into naviframe and see what this patch is meant to be doing. This reverts commit e3784b68e01849a99e06f31e02192ffb19d1275c. --- data/themes/edc/elm/naviframe.edc | 6 +----- src/lib/elc_naviframe.c | 17 +++++++++++------ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/data/themes/edc/elm/naviframe.edc b/data/themes/edc/elm/naviframe.edc index 2697ad4..943294b 100644 --- a/data/themes/edc/elm/naviframe.edc +++ b/data/themes/edc/elm/naviframe.edc @@ -551,11 +551,7 @@ group { name: "elm/naviframe/item/basic/default"; target: "elm.swallow.content"; target: "elements_clip"; } - program { - signal: "elm,state,invisible"; source: "elm"; - action: STATE_SET "hidden" 0.0; - target: "elements_clip"; - } + /* current page is being pushed: [previous]<----[current] */ program { signal: "elm,state,cur,pushed"; source: "elm"; diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c index 2b604e5..569a31f 100644 --- a/src/lib/elc_naviframe.c +++ b/src/lib/elc_naviframe.c @@ -535,6 +535,7 @@ _item_del_pre_hook(Elm_Object_Item *it) if (sd->freeze_events) evas_object_freeze_events_set(VIEW(prev_it), EINA_FALSE); _resize_object_reset(WIDGET(prev_it), prev_it); + evas_object_show(VIEW(prev_it)); _prev_page_focus_recover(prev_it); @@ -1077,7 +1078,8 @@ _on_item_push_finished(void *data, ELM_NAVIFRAME_DATA_GET(WIDGET(it), sd); - elm_object_signal_emit(VIEW(it), "elm,state,invisible", "elm"); + evas_object_hide(VIEW(it)); + elm_widget_tree_unfocusable_set(VIEW(it), it->unfocusable); if (sd->freeze_events) @@ -1526,6 +1528,8 @@ _item_push(Eo *obj, void *_pd, va_list *list) title_label, prev_btn, next_btn, content, item_style); if (!it) return; + evas_object_show(VIEW(it)); + if (prev_it) elm_widget_focused_object_clear(VIEW(prev_it)); _resize_object_reset(obj, it); if (prev_it) @@ -1606,8 +1610,6 @@ _item_insert_before(Eo *obj, void *_pd, va_list *list) (sd->stack, EINA_INLIST_GET(it), EINA_INLIST_GET(((Elm_Naviframe_Item *)before))); - elm_object_signal_emit(VIEW(it), "elm,state,invisible", "elm"); - elm_layout_sizing_eval(obj); *ret = (Elm_Object_Item *)it; @@ -1660,13 +1662,12 @@ _item_insert_after(Eo *obj, void *_pd, va_list *list) { elm_widget_focused_object_clear(VIEW(after)); _resize_object_reset(obj, it); - + evas_object_show(VIEW(it)); + evas_object_hide(VIEW(after)); if (elm_object_focus_allow_get(VIEW(it))) elm_object_focus_set(VIEW(it), EINA_TRUE); else elm_object_focus_set(WIDGET(it), EINA_TRUE); - elm_object_signal_emit(VIEW(it), "elm,state,visible", "elm"); - elm_object_signal_emit(VIEW(after), "elm,state,invisible", "elm"); } elm_layout_sizing_eval(obj); @@ -1746,6 +1747,7 @@ _item_pop(Eo *obj, void *_pd, va_list *list) /* these 2 signals MUST take place simultaneously */ elm_object_signal_emit(VIEW(it), "elm,state,cur,popped", "elm"); + evas_object_show(VIEW(prev_it)); elm_object_signal_emit(VIEW(prev_it), "elm,state,prev,popped", "elm"); edje_object_message_signal_process(elm_layout_edje_get(VIEW(it))); @@ -1830,6 +1832,9 @@ elm_naviframe_item_promote(Elm_Object_Item *it) } elm_object_signal_emit(VIEW(prev_it), "elm,state,cur,pushed", "elm"); + + evas_object_show(VIEW(nit)); + elm_object_signal_emit(VIEW(nit), "elm,state,new,pushed", "elm"); edje_object_message_signal_process(elm_layout_edje_get(VIEW(prev_it))); --
