Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_livethumb.c e_livethumb.h e_test.c e_widget_ilist.c
Log Message:
more ilist widget work... but more fix up livethumb to be cleaner
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_livethumb.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_livethumb.c 6 Nov 2005 05:48:50 -0000 1.1
+++ e_livethumb.c 6 Nov 2005 09:59:12 -0000 1.2
@@ -38,21 +38,10 @@
/* externally accessible functions */
Evas_Object *
-e_livethumb_add(Ecore_Evas *ee)
+e_livethumb_add(Evas *e)
{
- Evas_Object *obj;
- E_Smart_Data *sd;
-
-
_e_smart_init();
- obj = evas_object_smart_add(ecore_evas_get(ee), _e_smart);
- sd = evas_object_smart_data_get(obj);
- sd->evas_obj = ecore_evas_object_image_new(ee);
- evas_object_smart_member_add(sd->evas_obj, obj);
- evas_object_image_size_set(sd->evas_obj, sd->vw, sd->vh);
- sd->evas = ecore_evas_get(evas_object_data_get(sd->evas_obj, "Ecore_Evas"));
- e_canvas_add(evas_object_data_get(sd->evas_obj, "Ecore_Evas"));
- return obj;
+ return evas_object_smart_add(e, _e_smart);
}
Evas *
@@ -130,6 +119,12 @@
sd->h = 0;
sd->vw = 1;
sd->vh = 1;
+
+ sd->evas_obj =
ecore_evas_object_image_new(ecore_evas_ecore_evas_get(evas_object_evas_get(obj)));
+ evas_object_smart_member_add(sd->evas_obj, obj);
+ evas_object_image_size_set(sd->evas_obj, sd->vw, sd->vh);
+ sd->evas = ecore_evas_get(evas_object_data_get(sd->evas_obj, "Ecore_Evas"));
+ e_canvas_add(evas_object_data_get(sd->evas_obj, "Ecore_Evas"));
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_livethumb.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_livethumb.h 6 Nov 2005 05:48:50 -0000 1.1
+++ e_livethumb.h 6 Nov 2005 09:59:12 -0000 1.2
@@ -6,7 +6,7 @@
#ifndef E_LIVETHUMB_H
#define E_LIVETHUMB_H
-EAPI Evas_Object *e_livethumb_add (Ecore_Evas *ee);
+EAPI Evas_Object *e_livethumb_add (Evas *e);
EAPI Evas *e_livethumb_evas_get (Evas_Object *obj);
EAPI void e_livethumb_vsize_set (Evas_Object *obj,
Evas_Coord w, Evas_Coord h);
EAPI void e_livethumb_vsize_get (Evas_Object *obj,
Evas_Coord *w, Evas_Coord *h);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_test.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- e_test.c 6 Nov 2005 05:48:50 -0000 1.39
+++ e_test.c 6 Nov 2005 09:59:12 -0000 1.40
@@ -437,7 +437,7 @@
o = e_ilist_add(dia->win->evas);
e_ilist_icon_size_set(o, 80, 48);
- o3 = e_livethumb_add(dia->win->ecore_evas);
+ o3 = e_livethumb_add(dia->win->evas);
e_livethumb_vsize_set(o3, 160, 96);
o4 = edje_object_add(e_livethumb_evas_get(o3));
e_theme_edje_object_set(o4, "base/theme/borders",
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_widget_ilist.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_widget_ilist.c 6 Nov 2005 08:03:13 -0000 1.1
+++ e_widget_ilist.c 6 Nov 2005 09:59:12 -0000 1.2
@@ -47,9 +47,6 @@
evas_object_resize(obj, 32, 32);
e_widget_min_size_set(obj, 32, 32);
-// edje_object_size_min_calc(wd->o_frame, &mw, &mh);
-// e_widget_min_size_set(obj, mw, mh);
-
return obj;
}
@@ -60,6 +57,7 @@
Evas_Coord mw, mh, vw, vh, w, h;
wd = e_widget_data_get(obj);
+ /* FIXME: need to actually store the callback and call it */
e_ilist_append(wd->o_ilist, icon, label, _e_wid_cb_item_sel, wd, data);
if (icon) evas_object_show(icon);
e_ilist_min_size_get(wd->o_ilist, &mw, &mh);
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
