enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 13
Code Issues 26 Pull Requests 4 Projects Releases Wiki Activity

Formatting & whitespace removal. 

SVN revision: 32662
This commit is contained in:
Christopher Michael 2007-11-13 19:16:56 +00:00
parent 7807c8a61c
commit e0f12c3ab9
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/bin/e_widget_button.c
View File

@ -37,9 +37,9 @@ e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func
Evas_Object *obj, *o; Evas_Object *obj, *o;
E_Widget_Data *wd; E_Widget_Data *wd;
Evas_Coord mw, mh; Evas_Coord mw, mh;
obj = e_widget_add(evas); obj = e_widget_add(evas);
e_widget_del_hook_set(obj, _e_wid_del_hook); e_widget_del_hook_set(obj, _e_wid_del_hook);
e_widget_focus_hook_set(obj, _e_wid_focus_hook); e_widget_focus_hook_set(obj, _e_wid_focus_hook);
e_widget_activate_hook_set(obj, _e_wid_activate_hook); e_widget_activate_hook_set(obj, _e_wid_activate_hook);
@ -49,23 +49,25 @@ e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func
wd->data = data; wd->data = data;
wd->data2 = data2; wd->data2 = data2;
e_widget_data_set(obj, wd); e_widget_data_set(obj, wd);
o = edje_object_add(evas); o = edje_object_add(evas);
wd->o_button = o; wd->o_button = o;
e_theme_edje_object_set(o, "base/theme/widgets", e_theme_edje_object_set(o, "base/theme/widgets",
"e/widgets/button"); "e/widgets/button");
edje_object_signal_callback_add(o, "e,action,click", "", _e_wid_signal_cb1, obj); edje_object_signal_callback_add(o, "e,action,click", "",
_e_wid_signal_cb1, obj);
if (label && label[0] != 0) if (label && label[0] != 0)
{ {
edje_object_part_text_set(o, "e.text.label", label); edje_object_part_text_set(o, "e.text.label", label);
wd->type |= E_WIDGET_BUTTON_TEXT; wd->type |= E_WIDGET_BUTTON_TEXT;
} }
evas_object_show(o); evas_object_show(o);
e_widget_sub_object_add(obj, o); 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); e_widget_resize_object_set(obj, o);
if (icon) if (icon)
{ {
o = edje_object_add(evas); o = edje_object_add(evas);
@ -80,7 +82,7 @@ e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func
_e_wid_button_state_send(wd); _e_wid_button_state_send(wd);
edje_object_size_min_calc(wd->o_button, &mw, &mh); edje_object_size_min_calc(wd->o_button, &mw, &mh);
e_widget_min_size_set(obj, mw, mh); e_widget_min_size_set(obj, mw, mh);
return obj; return obj;
} }
@ -130,7 +132,7 @@ static void
_e_wid_del_hook(Evas_Object *obj) _e_wid_del_hook(Evas_Object *obj)
{ {
E_Widget_Data *wd; E_Widget_Data *wd;
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
free(wd); free(wd);
} }
@ -139,7 +141,7 @@ static void
_e_wid_focus_hook(Evas_Object *obj) _e_wid_focus_hook(Evas_Object *obj)
{ {
E_Widget_Data *wd; E_Widget_Data *wd;
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (e_widget_focus_get(obj)) if (e_widget_focus_get(obj))
{ {
@ -157,7 +159,7 @@ static void
_e_wid_activate_hook(Evas_Object *obj) _e_wid_activate_hook(Evas_Object *obj)
{ {
E_Widget_Data *wd; E_Widget_Data *wd;
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (wd->func) wd->func(wd->data, wd->data2); if (wd->func) wd->func(wd->data, wd->data2);
} }
@ -166,7 +168,7 @@ static void
_e_wid_disable_hook(Evas_Object *obj) _e_wid_disable_hook(Evas_Object *obj)
{ {
E_Widget_Data *wd; E_Widget_Data *wd;
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (e_widget_disabled_get(obj)) if (e_widget_disabled_get(obj))
edje_object_signal_emit(wd->o_button, "e,state,disabled", "e"); edje_object_signal_emit(wd->o_button, "e,state,disabled", "e");
@ -180,7 +182,7 @@ _e_wid_signal_cb1(void *data, Evas_Object *obj, const char *emission, const char
Evas_Object *wid; Evas_Object *wid;
wid = data; wid = data;
if (!wid || e_widget_disabled_get(wid)) return; if ((!wid) || (e_widget_disabled_get(wid))) return;
e_widget_focus_steal(wid); e_widget_focus_steal(wid);
e_widget_change(wid); e_widget_change(wid);
_e_wid_activate_hook(wid); _e_wid_activate_hook(wid);
@ -199,17 +201,11 @@ _e_wid_button_state_send(E_Widget_Data *wd)
if (wd->type & E_WIDGET_BUTTON_TEXT) if (wd->type & E_WIDGET_BUTTON_TEXT)
{ {
if (wd->type & E_WIDGET_BUTTON_ICON) if (wd->type & E_WIDGET_BUTTON_ICON)
{
edje_object_signal_emit(wd->o_button, "e,state,combo", "e"); edje_object_signal_emit(wd->o_button, "e,state,combo", "e");
}
else else
{
edje_object_signal_emit(wd->o_button, "e,state,text", "e"); edje_object_signal_emit(wd->o_button, "e,state,text", "e");
}
} }
else if (wd->type & E_WIDGET_BUTTON_ICON) else if (wd->type & E_WIDGET_BUTTON_ICON)
{ edje_object_signal_emit(wd->o_button, "e,state,icon", "e");
edje_object_signal_emit(wd->o_button, "e,state,icon", "e");
}
edje_object_message_signal_process(wd->o_button); edje_object_message_signal_process(wd->o_button);
} }