From 1436728f881740b99b29af719dcbcccf0ae97531 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Sat, 3 Apr 2010 01:03:40 +0000 Subject: [PATCH] Formatting & Whitespace removal. SVN revision: 47718 --- src/bin/e_widget_radio.c | 67 +++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/src/bin/e_widget_radio.c b/src/bin/e_widget_radio.c index 1073159c7..71201e213 100644 --- a/src/bin/e_widget_radio.c +++ b/src/bin/e_widget_radio.c @@ -32,7 +32,7 @@ EAPI E_Radio_Group * e_widget_radio_group_new(int *val) { E_Radio_Group *group; - + group = calloc(1, sizeof(E_Radio_Group)); group->valptr = val; return group; @@ -44,40 +44,44 @@ e_widget_radio_add(Evas *evas, const char *label, int valnum, E_Radio_Group *gro Evas_Object *obj, *o; E_Widget_Data *wd; Evas_Coord mw, mh; - + obj = e_widget_add(evas); - + e_widget_del_hook_set(obj, _e_wid_del_hook); e_widget_focus_hook_set(obj, _e_wid_focus_hook); e_widget_activate_hook_set(obj, _e_wid_activate_hook); e_widget_disable_hook_set(obj, _e_wid_disable_hook); + wd = calloc(1, sizeof(E_Widget_Data)); wd->group = group; wd->valnum = valnum; e_widget_data_set(obj, wd); - + o = edje_object_add(evas); wd->o_radio = o; e_theme_edje_object_set(o, "base/theme/widgets", "e/widgets/radio"); - edje_object_signal_callback_add(o, "e,action,toggle", "*", _e_wid_signal_cb1, obj); + edje_object_signal_callback_add(o, "e,action,toggle", "*", + _e_wid_signal_cb1, obj); edje_object_part_text_set(o, "e.text.label", label); evas_object_show(o); edje_object_size_min_calc(o, &mw, &mh); e_widget_size_min_set(obj, mw, mh); if ((wd->group) && (wd->group->valptr)) { - if (*(wd->group->valptr) == valnum) edje_object_signal_emit(o, "e,state,on", "e"); + if (*(wd->group->valptr) == valnum) + edje_object_signal_emit(o, "e,state,on", "e"); } if (wd->group) { wd->group->radios = eina_list_append(wd->group->radios, obj); } - + e_widget_sub_object_add(obj, o); - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_wid_focus_steal, obj); + evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, + _e_wid_focus_steal, obj); e_widget_resize_object_set(obj, o); - + return obj; } @@ -87,23 +91,25 @@ e_widget_radio_icon_add(Evas *evas, const char *label, const char *icon, int ico Evas_Object *obj, *o, *o2; E_Widget_Data *wd; Evas_Coord mw, mh; - + obj = e_widget_add(evas); - + e_widget_del_hook_set(obj, _e_wid_del_hook); e_widget_focus_hook_set(obj, _e_wid_focus_hook); e_widget_activate_hook_set(obj, _e_wid_activate_hook); e_widget_disable_hook_set(obj, _e_wid_disable_hook); + wd = calloc(1, sizeof(E_Widget_Data)); wd->group = group; wd->valnum = valnum; e_widget_data_set(obj, wd); - + o = edje_object_add(evas); wd->o_radio = o; e_theme_edje_object_set(o, "base/theme/widgets", "e/widgets/radio_icon"); - edje_object_signal_callback_add(o, "e,action,toggle", "*", _e_wid_signal_cb1, obj); + edje_object_signal_callback_add(o, "e,action,toggle", "*", + _e_wid_signal_cb1, obj); edje_object_part_text_set(o, "e.text.label", label); evas_object_show(o); @@ -112,7 +118,7 @@ e_widget_radio_icon_add(Evas *evas, const char *label, const char *icon, int ico edje_object_signal_emit(o, "e,state,labeled", "e"); edje_object_message_signal_process(o); } - + if (icon) { o2 = e_icon_add(evas); @@ -123,38 +129,37 @@ e_widget_radio_icon_add(Evas *evas, const char *label, const char *icon, int ico evas_object_show(o2); e_widget_sub_object_add(obj, o2); } - + edje_object_size_min_calc(o, &mw, &mh); e_widget_size_min_set(obj, mw, mh); if ((wd->group) && (wd->group->valptr)) { - if (*(wd->group->valptr) == valnum) edje_object_signal_emit(o, "e,state,on", "e"); + if (*(wd->group->valptr) == valnum) + edje_object_signal_emit(o, "e,state,on", "e"); } if (wd->group) - { - wd->group->radios = eina_list_append(wd->group->radios, obj); - } - + wd->group->radios = eina_list_append(wd->group->radios, obj); + e_widget_sub_object_add(obj, o); - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_wid_focus_steal, obj); + evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, + _e_wid_focus_steal, obj); e_widget_resize_object_set(obj, o); - + return obj; } EAPI void e_widget_radio_toggle_set(Evas_Object *obj, int toggle) { - E_Widget_Data *wd; + E_Widget_Data *wd; - wd = e_widget_data_get(obj); - if (!wd) return; + if (!(wd = e_widget_data_get(obj))) return; if (toggle) { Eina_List *l; Evas_Object *sobj; - + EINA_LIST_FOREACH(wd->group->radios, l, sobj) { if (sobj != obj) @@ -179,7 +184,7 @@ static void _e_wid_del_hook(Evas_Object *obj) { E_Widget_Data *wd; - + wd = e_widget_data_get(obj); if (wd->group) { @@ -193,7 +198,7 @@ static void _e_wid_focus_hook(Evas_Object *obj) { E_Widget_Data *wd; - + wd = e_widget_data_get(obj); if (e_widget_focus_get(obj)) { @@ -211,7 +216,7 @@ static void _e_wid_do(Evas_Object *obj) { E_Widget_Data *wd; - + if (e_widget_disabled_get(obj)) return; wd = e_widget_data_get(obj); @@ -220,7 +225,7 @@ _e_wid_do(Evas_Object *obj) Eina_List *l; Evas_Object *sobj; int toggled = 0; - + EINA_LIST_FOREACH(wd->group->radios, l, sobj) { if (sobj != obj) @@ -252,7 +257,7 @@ static void _e_wid_disable_hook(Evas_Object *obj) { E_Widget_Data *wd; - + wd = e_widget_data_get(obj); if (e_widget_disabled_get(obj)) edje_object_signal_emit(wd->o_radio, "e,state,disabled", "e");