Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_widget_button.c
Log Message:
Formatting & whitespace removal.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_button.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_widget_button.c 5 Oct 2007 06:05:16 -0000 1.17
+++ e_widget_button.c 13 Nov 2007 19:16:56 -0000 1.18
@@ -37,9 +37,9 @@
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);
@@ -49,23 +49,25 @@
wd->data = data;
wd->data2 = data2;
e_widget_data_set(obj, wd);
-
+
o = edje_object_add(evas);
wd->o_button = o;
e_theme_edje_object_set(o, "base/theme/widgets",
"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)
{
edje_object_part_text_set(o, "e.text.label", label);
wd->type |= E_WIDGET_BUTTON_TEXT;
}
evas_object_show(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);
-
+
if (icon)
{
o = edje_object_add(evas);
@@ -80,7 +82,7 @@
_e_wid_button_state_send(wd);
edje_object_size_min_calc(wd->o_button, &mw, &mh);
e_widget_min_size_set(obj, mw, mh);
-
+
return obj;
}
@@ -130,7 +132,7 @@
_e_wid_del_hook(Evas_Object *obj)
{
E_Widget_Data *wd;
-
+
wd = e_widget_data_get(obj);
free(wd);
}
@@ -139,7 +141,7 @@
_e_wid_focus_hook(Evas_Object *obj)
{
E_Widget_Data *wd;
-
+
wd = e_widget_data_get(obj);
if (e_widget_focus_get(obj))
{
@@ -157,7 +159,7 @@
_e_wid_activate_hook(Evas_Object *obj)
{
E_Widget_Data *wd;
-
+
wd = e_widget_data_get(obj);
if (wd->func) wd->func(wd->data, wd->data2);
}
@@ -166,7 +168,7 @@
_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_button, "e,state,disabled", "e");
@@ -180,7 +182,7 @@
Evas_Object *wid;
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_change(wid);
_e_wid_activate_hook(wid);
@@ -199,17 +201,11 @@
if (wd->type & E_WIDGET_BUTTON_TEXT)
{
if (wd->type & E_WIDGET_BUTTON_ICON)
- {
edje_object_signal_emit(wd->o_button, "e,state,combo", "e");
- }
else
- {
edje_object_signal_emit(wd->o_button, "e,state,text", "e");
- }
}
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);
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
