Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_widget_aspect.c
Log Message:
fix aspect widget
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_aspect.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_widget_aspect.c 25 Jan 2007 17:15:10 -0000 1.2
+++ e_widget_aspect.c 2 May 2007 02:06:39 -0000 1.3
@@ -54,19 +54,15 @@
cx = px + ((pw - cw) / 2);
cy = py + ((ph - ch) / 2);
+ printf("ASPECT RECONF - p: %d,%d %dx%d c: %d,%d %dx%d\n", px, py, pw, ph,
cx, cy, cw, ch);
evas_object_resize(wd->child, cw, ch);
evas_object_move(wd->child, cx, cy);
}
static void
-_e_wid_resize_intercept(void *data, Evas_Object *obj, int w, int h)
+_cb_reconfigure(void *data, Evas *a, Evas_Object *obj, void *event_info)
{
- E_Widget_Data *wd;
-
- wd = e_widget_data_get(obj);
- if (!wd) return;
-
- evas_object_resize(obj, w, h);
+ E_Widget_Data *wd = data;
_e_wid_reconfigure(wd);
}
@@ -83,7 +79,8 @@
e_widget_data_set(obj, wd);
e_widget_del_hook_set(obj, _e_wid_del_hook);
- evas_object_intercept_resize_callback_add(obj, _e_wid_resize_intercept, wd);
+ evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _cb_reconfigure,
wd);
+ evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _cb_reconfigure,
wd);
e_widget_aspect_aspect_set(obj, w, h);
return obj;
@@ -106,10 +103,14 @@
e_widget_aspect_child_set(Evas_Object *obj, Evas_Object *child)
{
E_Widget_Data *wd;
+ int mw, mh;
wd = e_widget_data_get(obj);
if (!wd) return;
wd->child = child;
+ e_widget_min_size_get(child, &mw, &mh);
+ e_widget_min_size_set(obj, mw, mh);
+ e_widget_sub_object_add(obj, child);
_e_wid_reconfigure(wd);
}
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
