summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2014-03-07 11:12:06 +0900
committerChunEon Park <hermet@hermet.pe.kr>2014-03-07 11:12:06 +0900
commita72dbe47416dc88aea1c09f1a9b6e064cb20c0da (patch)
tree481515a9547f8766a4ee25fccfa1d76e6d48fffe
parent4adcafb1896aed492815959eb45f7817e0b33a7f (diff)
naviframe: Fix smart_show function to show only top item view
Summary: Now if evas_object_show is called for naviframe, all item views are shown. This may cause the previous item view is overlapped to the top item view. To resolve this problem, fix smart_show of naviframe to show only top item view. @fix Reviewers: Hermet CC: seoz Differential Revision: https://phab.enlightenment.org/D594
-rw-r--r--src/lib/elc_naviframe.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 52189328f..8e358dd39 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -1406,6 +1406,17 @@ _elm_naviframe_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1406 eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); 1406 eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
1407} 1407}
1408 1408
1409//Show only the top item view
1410static void
1411_elm_naviframe_smart_show(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
1412{
1413 Elm_Naviframe_Item *top;
1414
1415 top = (Elm_Naviframe_Item *)elm_naviframe_top_item_get(obj);
1416 if (top && !top->delete_me)
1417 evas_object_show(VIEW(top));
1418}
1419
1409static void 1420static void
1410_elm_naviframe_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list) 1421_elm_naviframe_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
1411{ 1422{
@@ -2136,6 +2147,7 @@ _class_constructor(Eo_Class *klass)
2136 2147
2137 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_naviframe_smart_add), 2148 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_naviframe_smart_add),
2138 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_naviframe_smart_del), 2149 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_naviframe_smart_del),
2150 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_SHOW), _elm_naviframe_smart_show),
2139 2151
2140 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_naviframe_smart_focus_next_manager_is), 2152 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_naviframe_smart_focus_next_manager_is),
2141 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_naviframe_smart_focus_next), 2153 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_naviframe_smart_focus_next),