From ca830ed59d132483ea8f090c745f6b610114661a Mon Sep 17 00:00:00 2001 From: hermet Date: Wed, 12 Oct 2011 11:13:18 +0000 Subject: [PATCH] elementray/naviframe - added more signals for buttons and removed warnings. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@64017 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/elc_naviframe.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c index cadd818..f8cae0e 100644 --- a/src/lib/elc_naviframe.c +++ b/src/lib/elc_naviframe.c @@ -506,6 +506,7 @@ _title_prev_btn_del(void *data, Elm_Naviframe_Item *it = data; it->back_btn = EINA_FALSE; it->title_prev_btn = NULL; + edje_object_signal_emit(it->base.view, "elm,state,prev_btn,hide", "elm"); } static void @@ -516,6 +517,7 @@ _title_next_btn_del(void *data, { Elm_Naviframe_Item *it = data; it->title_next_btn = NULL; + edje_object_signal_emit(it->base.view, "elm,state,next_btn,hide", "elm"); } static void @@ -594,7 +596,13 @@ _title_prev_btn_set(Elm_Naviframe_Item *it, it->title_prev_btn = btn; - if (!btn) return; + if (!btn) + { + edje_object_signal_emit(it->base.view, + "elm,state,prev_btn,hide", + "elm"); + return; + } elm_widget_sub_object_add(it->base.widget, btn); evas_object_event_callback_add(btn, @@ -602,6 +610,7 @@ _title_prev_btn_set(Elm_Naviframe_Item *it, _title_prev_btn_del, it); edje_object_part_swallow(it->base.view, "elm.swallow.prev_btn", btn); + edje_object_signal_emit(it->base.view, "elm,state,prev_btn,show", "elm"); it->back_btn = back_btn; _item_sizing_eval(it); @@ -617,7 +626,13 @@ _title_next_btn_set(Elm_Naviframe_Item *it, Evas_Object *btn) it->title_next_btn = btn; - if (!btn) return; + if (!btn) + { + edje_object_signal_emit(it->base.view, + "elm,state,next_btn,hide", + "elm"); + return; + } elm_widget_sub_object_add(it->base.widget, btn); evas_object_event_callback_add(btn, @@ -625,6 +640,7 @@ _title_next_btn_set(Elm_Naviframe_Item *it, Evas_Object *btn) _title_next_btn_del, it); edje_object_part_swallow(it->base.view, "elm.swallow.next_btn", btn); + edje_object_signal_emit(it->base.view, "elm,state,next_btn,show", "elm"); _item_sizing_eval(it); } @@ -1083,18 +1099,18 @@ elm_naviframe_item_title_visible_get(const Elm_Object_Item *it) EAPI void elm_naviframe_prev_btn_auto_pushed_set(Evas_Object *obj, Eina_Bool auto_pushed) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; + ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; + if (!wd) return; wd->auto_pushed = !!auto_pushed; } EAPI Eina_Bool elm_naviframe_prev_btn_auto_pushed_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; + ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; + if (!wd) return EINA_FALSE; return wd->auto_pushed; } -- 2.7.4