Remove some unneeded variables. Formatting & Whitespace removal.

SVN revision: 40679
This commit is contained in:
Christopher Michael 2009-05-15 17:59:02 +00:00
parent 87842cb5e7
commit 3f11b601c6
1 changed files with 16 additions and 17 deletions

View File

@ -10,8 +10,7 @@ typedef struct _E_Smart_Data E_Smart_Data;
struct _E_Smart_Data struct _E_Smart_Data
{ {
Evas_Object *smart_obj; Evas_Object *smart_obj, *child_obj;
Evas_Object *child_obj;
Evas_Coord x, y, w, h; Evas_Coord x, y, w, h;
Evas_Coord child_w, child_h, px, py; Evas_Coord child_w, child_h, px, py;
}; };
@ -58,20 +57,21 @@ e_pan_child_set(Evas_Object *obj, Evas_Object *child)
} }
if (child) if (child)
{ {
Evas_Coord w, h;
int r, g, b, a; int r, g, b, a;
sd->child_obj = child; sd->child_obj = child;
evas_object_smart_member_add(sd->child_obj, sd->smart_obj); evas_object_smart_member_add(sd->child_obj, sd->smart_obj);
evas_object_geometry_get(sd->child_obj, NULL, NULL, &w, &h); evas_object_geometry_get(sd->child_obj, NULL, NULL,
sd->child_w = w; &sd->child_w, &sd->child_h);
sd->child_h = h; evas_object_event_callback_add(child, EVAS_CALLBACK_FREE,
evas_object_event_callback_add(child, EVAS_CALLBACK_FREE, _e_smart_child_del_hook, sd); _e_smart_child_del_hook, sd);
evas_object_event_callback_add(child, EVAS_CALLBACK_RESIZE, _e_smart_child_resize_hook, sd); evas_object_event_callback_add(child, EVAS_CALLBACK_RESIZE,
_e_smart_child_resize_hook, sd);
evas_object_color_get(sd->smart_obj, &r, &g, &b, &a); evas_object_color_get(sd->smart_obj, &r, &g, &b, &a);
evas_object_color_set(sd->child_obj, r, g, b, a); evas_object_color_set(sd->child_obj, r, g, b, a);
evas_object_clip_set(sd->child_obj, evas_object_clip_get(sd->smart_obj)); evas_object_clip_set(sd->child_obj, evas_object_clip_get(sd->smart_obj));
if (evas_object_visible_get(sd->smart_obj)) evas_object_show(sd->child_obj); if (evas_object_visible_get(sd->smart_obj))
evas_object_show(sd->child_obj);
else evas_object_hide(sd->child_obj); else evas_object_hide(sd->child_obj);
_e_smart_reconfigure(sd); _e_smart_reconfigure(sd);
} }
@ -271,4 +271,3 @@ _e_smart_init(void)
_e_smart = evas_smart_class_new(&sc); _e_smart = evas_smart_class_new(&sc);
} }
} }