summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-01-24 17:35:37 +0000
committerTom Hacohen <tom@stosb.com>2014-01-24 17:37:24 +0000
commit534610bdecfd7b8f283f94918ff152841e1626cc (patch)
treeda97ba23593461b19639855329544fe54c834cfb
parent467582ff6d199d04f96093628abe0563b7aefbdd (diff)
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.
-rw-r--r--data/themes/edc/elm/naviframe.edc6
-rw-r--r--src/lib/elc_naviframe.c17
2 files changed, 12 insertions, 11 deletions
diff --git a/data/themes/edc/elm/naviframe.edc b/data/themes/edc/elm/naviframe.edc
index 2697ad4dc..943294bca 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";
551 target: "elm.swallow.content"; 551 target: "elm.swallow.content";
552 target: "elements_clip"; 552 target: "elements_clip";
553 } 553 }
554 program { 554
555 signal: "elm,state,invisible"; source: "elm";
556 action: STATE_SET "hidden" 0.0;
557 target: "elements_clip";
558 }
559 /* current page is being pushed: [previous]<----[current] */ 555 /* current page is being pushed: [previous]<----[current] */
560 program { 556 program {
561 signal: "elm,state,cur,pushed"; source: "elm"; 557 signal: "elm,state,cur,pushed"; source: "elm";
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 2b604e501..569a31f76 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)
535 if (sd->freeze_events) 535 if (sd->freeze_events)
536 evas_object_freeze_events_set(VIEW(prev_it), EINA_FALSE); 536 evas_object_freeze_events_set(VIEW(prev_it), EINA_FALSE);
537 _resize_object_reset(WIDGET(prev_it), prev_it); 537 _resize_object_reset(WIDGET(prev_it), prev_it);
538 evas_object_show(VIEW(prev_it));
538 539
539 _prev_page_focus_recover(prev_it); 540 _prev_page_focus_recover(prev_it);
540 541
@@ -1077,7 +1078,8 @@ _on_item_push_finished(void *data,
1077 1078
1078 ELM_NAVIFRAME_DATA_GET(WIDGET(it), sd); 1079 ELM_NAVIFRAME_DATA_GET(WIDGET(it), sd);
1079 1080
1080 elm_object_signal_emit(VIEW(it), "elm,state,invisible", "elm"); 1081 evas_object_hide(VIEW(it));
1082
1081 elm_widget_tree_unfocusable_set(VIEW(it), it->unfocusable); 1083 elm_widget_tree_unfocusable_set(VIEW(it), it->unfocusable);
1082 1084
1083 if (sd->freeze_events) 1085 if (sd->freeze_events)
@@ -1526,6 +1528,8 @@ _item_push(Eo *obj, void *_pd, va_list *list)
1526 title_label, prev_btn, next_btn, content, item_style); 1528 title_label, prev_btn, next_btn, content, item_style);
1527 if (!it) return; 1529 if (!it) return;
1528 1530
1531 evas_object_show(VIEW(it));
1532
1529 if (prev_it) elm_widget_focused_object_clear(VIEW(prev_it)); 1533 if (prev_it) elm_widget_focused_object_clear(VIEW(prev_it));
1530 _resize_object_reset(obj, it); 1534 _resize_object_reset(obj, it);
1531 if (prev_it) 1535 if (prev_it)
@@ -1606,8 +1610,6 @@ _item_insert_before(Eo *obj, void *_pd, va_list *list)
1606 (sd->stack, EINA_INLIST_GET(it), 1610 (sd->stack, EINA_INLIST_GET(it),
1607 EINA_INLIST_GET(((Elm_Naviframe_Item *)before))); 1611 EINA_INLIST_GET(((Elm_Naviframe_Item *)before)));
1608 1612
1609 elm_object_signal_emit(VIEW(it), "elm,state,invisible", "elm");
1610
1611 elm_layout_sizing_eval(obj); 1613 elm_layout_sizing_eval(obj);
1612 1614
1613 *ret = (Elm_Object_Item *)it; 1615 *ret = (Elm_Object_Item *)it;
@@ -1660,13 +1662,12 @@ _item_insert_after(Eo *obj, void *_pd, va_list *list)
1660 { 1662 {
1661 elm_widget_focused_object_clear(VIEW(after)); 1663 elm_widget_focused_object_clear(VIEW(after));
1662 _resize_object_reset(obj, it); 1664 _resize_object_reset(obj, it);
1663 1665 evas_object_show(VIEW(it));
1666 evas_object_hide(VIEW(after));
1664 if (elm_object_focus_allow_get(VIEW(it))) 1667 if (elm_object_focus_allow_get(VIEW(it)))
1665 elm_object_focus_set(VIEW(it), EINA_TRUE); 1668 elm_object_focus_set(VIEW(it), EINA_TRUE);
1666 else 1669 else
1667 elm_object_focus_set(WIDGET(it), EINA_TRUE); 1670 elm_object_focus_set(WIDGET(it), EINA_TRUE);
1668 elm_object_signal_emit(VIEW(it), "elm,state,visible", "elm");
1669 elm_object_signal_emit(VIEW(after), "elm,state,invisible", "elm");
1670 } 1671 }
1671 1672
1672 elm_layout_sizing_eval(obj); 1673 elm_layout_sizing_eval(obj);
@@ -1746,6 +1747,7 @@ _item_pop(Eo *obj, void *_pd, va_list *list)
1746 1747
1747 /* these 2 signals MUST take place simultaneously */ 1748 /* these 2 signals MUST take place simultaneously */
1748 elm_object_signal_emit(VIEW(it), "elm,state,cur,popped", "elm"); 1749 elm_object_signal_emit(VIEW(it), "elm,state,cur,popped", "elm");
1750 evas_object_show(VIEW(prev_it));
1749 elm_object_signal_emit(VIEW(prev_it), "elm,state,prev,popped", "elm"); 1751 elm_object_signal_emit(VIEW(prev_it), "elm,state,prev,popped", "elm");
1750 1752
1751 edje_object_message_signal_process(elm_layout_edje_get(VIEW(it))); 1753 edje_object_message_signal_process(elm_layout_edje_get(VIEW(it)));
@@ -1830,6 +1832,9 @@ elm_naviframe_item_promote(Elm_Object_Item *it)
1830 } 1832 }
1831 1833
1832 elm_object_signal_emit(VIEW(prev_it), "elm,state,cur,pushed", "elm"); 1834 elm_object_signal_emit(VIEW(prev_it), "elm,state,cur,pushed", "elm");
1835
1836 evas_object_show(VIEW(nit));
1837
1833 elm_object_signal_emit(VIEW(nit), "elm,state,new,pushed", "elm"); 1838 elm_object_signal_emit(VIEW(nit), "elm,state,new,pushed", "elm");
1834 1839
1835 edje_object_message_signal_process(elm_layout_edje_get(VIEW(prev_it))); 1840 edje_object_message_signal_process(elm_layout_edje_get(VIEW(prev_it)));