Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_ilist.c e_ilist.h e_includes.h e_scrollframe.c
e_test.c
Added Files:
e_livethumb.c e_livethumb.h
Log Message:
ading "livethumb" - it uses the ecore evas buffer engine stuff to make a
canvas withni a canvas as a smart obj where ucan set 1 object as the base.
going to be handy for some stuff...
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- Makefile.am 5 Nov 2005 12:12:17 -0000 1.76
+++ Makefile.am 6 Nov 2005 05:48:50 -0000 1.77
@@ -109,7 +109,8 @@
e_file_selector.h \
e_file_dialog.h \
e_int_border_menu.h \
-e_ilist.h
+e_ilist.h \
+e_livethumb.h
enlightenment_src = \
e_user.c \
@@ -200,6 +201,7 @@
e_file_dialog.c \
e_int_border_menu.c \
e_ilist.c \
+e_livethumb.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_SOURCES = \
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ilist.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_ilist.c 5 Nov 2005 13:54:43 -0000 1.3
+++ e_ilist.c 6 Nov 2005 05:48:50 -0000 1.4
@@ -295,6 +295,16 @@
_e_smart_del(Evas_Object *obj)
{
INTERNAL_ENTRY;
+ while (sd->items)
+ {
+ E_Smart_Item *si;
+
+ si = sd->items->data;
+ sd->items = evas_list_remove_list(sd->items, sd->items);
+ if (si->icon_obj) evas_object_del(si->icon_obj);
+ evas_object_del(si->base_obj);
+ free(si);
+ }
evas_object_del(sd->box_obj);
free(sd);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ilist.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_ilist.h 5 Nov 2005 13:54:43 -0000 1.2
+++ e_ilist.h 6 Nov 2005 05:48:50 -0000 1.3
@@ -7,6 +7,7 @@
#define E_ILIST_H
EAPI Evas_Object *e_ilist_add (Evas *evas);
+EAPI void e_ilist_icon_size_set (Evas_Object *obj, Evas_Coord
w, Evas_Coord h);
EAPI void e_ilist_append (Evas_Object *obj, Evas_Object
*icon, char *label, void (*func) (void *data, void *data2), void *data, void
*data2);
EAPI void e_ilist_select_set (Evas_Object *obj, int n);
EAPI int e_ilist_select_get (Evas_Object *obj);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- e_includes.h 5 Nov 2005 12:12:17 -0000 1.60
+++ e_includes.h 6 Nov 2005 05:48:50 -0000 1.61
@@ -90,3 +90,4 @@
#include "e_widget_fileman.h"
#include "e_int_border_menu.h"
#include "e_ilist.h"
+#include "e_livethumb.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_scrollframe.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_scrollframe.c 6 Nov 2005 03:40:24 -0000 1.6
+++ e_scrollframe.c 6 Nov 2005 05:48:50 -0000 1.7
@@ -205,10 +205,18 @@
nx = px;
if (x < px) nx = x;
- else if ((x + w) > (px + (cw - mx))) nx = x + w - (cw - mx);
+ else if ((x + w) > (px + (cw - mx)))
+ {
+ nx = x + w - (cw - mx);
+ if (nx > x) nx = x;
+ }
ny = py;
if (y < py) ny = y;
- else if ((y + h) > (py + (ch - my))) ny = y + h - (ch - my);
+ else if ((y + h) > (py + (ch - my)))
+ {
+ ny = y + h - (ch - my);
+ if (ny > y) ny = y;
+ }
if ((nx == px) && (ny == py)) return;
e_scrollframe_child_pos_set(obj, nx, ny);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_test.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- e_test.c 6 Nov 2005 03:40:24 -0000 1.38
+++ e_test.c 6 Nov 2005 05:48:50 -0000 1.39
@@ -429,15 +429,20 @@
{
E_Dialog *dia;
Evas_Coord mw, mh, vw, vh;
- Evas_Object *o, *o2, *o3;
+ Evas_Object *o, *o2, *o3, *o4;
dia = e_dialog_new(con);
e_dialog_title_set(dia, "A Test Dialog");
o = e_ilist_add(dia->win->evas);
+ e_ilist_icon_size_set(o, 80, 48);
- o3 = e_icon_add(dia->win->evas);
- e_icon_file_set(o3, "/home/raster/C/stuff/icons/star_office.png");
+ o3 = e_livethumb_add(dia->win->ecore_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",
+ "widgets/border/default/border");
+ e_livethumb_thumb_set(o3, o4);
e_ilist_append(o, o3, "Item 1", _e_test_sel, NULL, NULL);
o3 = e_icon_add(dia->win->evas);
-------------------------------------------------------
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
