From b736efb3d784654cad054dbbdd92ae6a737eb277 Mon Sep 17 00:00:00 2001 From: Rajeev Ranjan Date: Thu, 2 Sep 2010 19:58:48 +0900 Subject: [PATCH] [src/lib/elm_button.c] Commented the code for resettig text on events like click, focus etc by calling _set_label. Also initialize the label text in elm_button_add API with NULL --- src/lib/elm_button.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c index 9c943ef..70063c6 100644 --- a/src/lib/elm_button.c +++ b/src/lib/elm_button.c @@ -92,9 +92,10 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj) { if(wd->statelabel[DEFAULT]) _set_label(obj, wd->statelabel[DEFAULT]); +#if 0 else _set_label(obj, wd->label); - +#endif edje_object_signal_emit(wd->btn, "elm,action,unfocus", "elm"); evas_object_focus_set(wd->btn, 0); } @@ -143,8 +144,10 @@ _disable_hook(Evas_Object *obj) { if(wd->statelabel[DEFAULT]) _set_label(obj, wd->statelabel[DEFAULT]); +#if 0 else _set_label(obj, wd->label); +#endif edje_object_signal_emit(wd->btn, "elm,state,enabled", "elm"); } } @@ -266,8 +269,10 @@ _signal_default_text_set(void *data, Evas_Object *obj, const char *emission, con if (!wd) return; if(wd->statelabel[DEFAULT]) _set_label(data, wd->statelabel[DEFAULT]); +#if 0 else _set_label(data, wd->label); +#endif return; } @@ -278,8 +283,10 @@ _signal_unpressed(void *data, Evas_Object *obj __UNUSED__, const char *emission if (!wd) return; if(wd->statelabel[DEFAULT]) _set_label(data, wd->statelabel[DEFAULT]); +#if 0 else _set_label(data, wd->label); +#endif if (wd->timer) { @@ -323,6 +330,10 @@ elm_button_add(Evas_Object *parent) wd->statetype[HIGHLIGHTED] = 0; wd->statetype[FOCUSED] = 0; wd->statetype[DISABLED] = 0; + wd->statelabel[DEFAULT] = 0; + wd->statelabel[HIGHLIGHTED] = 0; + wd->statelabel[FOCUSED] = 0; + wd->statelabel[DISABLED] = 0; edje_object_signal_callback_add(wd->btn, "elm,action,click", "", _signal_clicked, obj); edje_object_signal_callback_add(wd->btn, "elm,action,press", "", -- 2.7.4