Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_widget.c
Log Message:
- formatting
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- ewl_widget.c 27 May 2006 23:46:39 -0000 1.84
+++ ewl_widget.c 28 May 2006 00:03:27 -0000 1.85
@@ -723,7 +723,7 @@
if (w->theme_object) {
if (ewl_config.theme.print_signals)
- printf("Emitting: %s\n", state);
+ printf("Emitting: %s to %p\n", state, w);
edje_object_signal_emit(w->theme_object, state, "EWL");
}
@@ -1898,12 +1898,12 @@
evas_object_smart_member_add(w->smart_object, smart_parent);
- if (w->theme_object) {
+ if (w->theme_object)
evas_object_smart_member_add(w->theme_object, w->smart_object);
- }
- if (w->fx_clip_box) {
+
+ if (w->fx_clip_box)
evas_object_smart_member_add(w->fx_clip_box, w->smart_object);
- }
+
if (w->theme_object && w->fx_clip_box)
evas_object_stack_below(w->theme_object, w->fx_clip_box);
@@ -2113,8 +2113,10 @@
if (w->smart_object)
evas_object_show(w->smart_object);
+
if (w->fx_clip_box)
evas_object_show(w->fx_clip_box);
+
if (w->theme_object)
evas_object_show(w->theme_object);
@@ -2225,7 +2227,7 @@
*/
evas_object_repeat_events_set(w->theme_object, 1);
edje_object_file_set(w->theme_object, w->bit_path,
- w->bit_group);
+ w->bit_group);
/*
* If the file failed to load, destroy the unnecessary evas
* object.
@@ -2420,11 +2422,8 @@
i = ewl_theme_image_get(w, "file");
group = ewl_theme_data_str_get(w, "group");
- if (i)
- w->bit_path = ecore_string_instance(i);
-
- if (group)
- w->bit_group = ecore_string_instance(group);
+ if (i) w->bit_path = ecore_string_instance(i);
+ if (group) w->bit_group = ecore_string_instance(group);
IF_FREE(i);
IF_FREE(group);
@@ -2442,7 +2441,6 @@
* Set up the theme object on the widgets evas
*/
if (w->theme_object) {
-
ewl_widget_theme_insets_get(w, &i_l, &i_r, &i_t, &i_b);
ewl_widget_theme_padding_get(w, &p_l, &p_r, &p_t, &p_b);
@@ -2451,25 +2449,17 @@
/*
* Use previously set insets and padding if available.
*/
- if (l)
- i_l = l;
- if (r)
- i_r = r;
- if (t)
- i_t = t;
- if (b)
- i_b = b;
+ if (l) i_l = l;
+ if (r) i_r = r;
+ if (t) i_t = t;
+ if (b) i_b = b;
ewl_object_padding_get(EWL_OBJECT(w), &l, &r, &t, &b);
- if (l)
- p_l = l;
- if (r)
- p_r = r;
- if (t)
- p_t = t;
- if (b)
- p_b = b;
+ if (l) p_l = l;
+ if (r) p_r = r;
+ if (t) p_t = t;
+ if (b) p_b = b;
/*
* Assign the relevant insets and padding.
@@ -2901,24 +2891,20 @@
* Read in the padding values from the edje file
*/
key = edje_object_data_get(w->theme_object, "pad/left");
- if (key && l) {
+ if (key && l)
*l = atoi(key);
- }
key = edje_object_data_get(w->theme_object, "pad/right");
- if (key && r) {
+ if (key && r)
*r = atoi(key);
- }
key = edje_object_data_get(w->theme_object, "pad/top");
- if (key && t) {
+ if (key && t)
*t = atoi(key);
- }
key = edje_object_data_get(w->theme_object, "pad/bottom");
- if (key && b) {
+ if (key && b)
*b = atoi(key);
- }
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -2936,24 +2922,20 @@
* Read in the inset values from the edje file
*/
key = edje_object_data_get(w->theme_object, "inset/left");
- if (key && l) {
+ if (key && l)
*l = atoi(key);
- }
key = edje_object_data_get(w->theme_object, "inset/right");
- if (key && r) {
+ if (key && r)
*r = atoi(key);
- }
key = edje_object_data_get(w->theme_object, "inset/top");
- if (key && t) {
+ if (key && t)
*t = atoi(key);
- }
key = edje_object_data_get(w->theme_object, "inset/bottom");
- if (key && b) {
+ if (key && b)
*b = atoi(key);
- }
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-------------------------------------------------------
All the advantages of Linux Managed Hosting--Without the Cost and Risk!
Fully trained technicians. The highest number of Red Hat certifications in
the hosting industry. Fanatical Support. Click to learn more
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=107521&bid=248729&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
