Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_icon.c e_fileman_smart.c
Log Message:
- work on icon thumbs, give them their own theme part.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_icon.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_fileman_icon.c 2 Nov 2005 09:17:44 -0000 1.13
+++ e_fileman_icon.c 3 Nov 2005 15:26:46 -0000 1.14
@@ -20,6 +20,7 @@
Evas_Object *image_object;
Evas_Object *entry_object;
Evas_Object *title_object;
+ Evas_Object *thumb_object;
E_Fm_File *file;
@@ -131,10 +132,20 @@
{
sd->thumb_path = e_thumb_file_get(sd->file->path);
if (e_thumb_exists(sd->file->path))
- sd->image_object = e_thumb_evas_object_get(sd->file->path,
- sd->evas,
- sd->iw,
- sd->ih);
+ {
+ sd->thumb_object = e_thumb_evas_object_get(sd->file->path,
+ sd->evas,
+ sd->iw,
+ sd->ih);
+ evas_object_smart_member_add(sd->thumb_object, sd->obj);
+
+ sd->image_object = edje_object_add(sd->evas);
+ edje_extern_object_min_size_set(sd->image_object, sd->iw, sd->ih);
+ e_theme_edje_object_set(sd->image_object, "base/theme/fileman",
+ "fileman/icon_thumb");
+ edje_object_part_swallow(sd->image_object, "icon_swallow",
+ sd->thumb_object);
+ }
else
{
thumb_files = evas_list_append(thumb_files, sd);
@@ -307,6 +318,11 @@
evas_object_smart_member_del(sd->title_object);
evas_object_del(sd->title_object);
}
+ if (sd->thumb_object)
+ {
+ evas_object_smart_member_del(sd->thumb_object);
+ evas_object_del(sd->thumb_object);
+ }
E_FREE(sd->saved_title);
if (sd->file) e_object_unref(E_OBJECT(sd->file));
free(sd);
@@ -453,11 +469,23 @@
if ((ext) || (ecore_file_exists(sd->thumb_path)))
{
if (sd->image_object) evas_object_del(sd->image_object);
- sd->image_object = e_thumb_evas_object_get(sd->file->path,
+
+ sd->thumb_object = e_thumb_evas_object_get(sd->file->path,
sd->evas,
- sd->iw, sd->ih);
+ sd->iw,
+ sd->ih);
+ evas_object_smart_member_add(sd->thumb_object, sd->obj);
+
+ sd->image_object = edje_object_add(sd->evas);
+ edje_extern_object_min_size_set(sd->image_object, sd->iw, sd->ih);
+ e_theme_edje_object_set(sd->image_object, "base/theme/fileman",
+ "fileman/icon_thumb");
+ edje_object_part_swallow(sd->image_object, "icon_swallow",
+ sd->thumb_object);
edje_object_part_swallow(sd->icon_object, "icon_swallow",
sd->image_object);
+ edje_object_part_swallow(sd->icon_object, "icon_title",
+ sd->title_object);
}
pid = -1;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- e_fileman_smart.c 3 Nov 2005 06:17:08 -0000 1.76
+++ e_fileman_smart.c 3 Nov 2005 15:26:46 -0000 1.77
@@ -1858,7 +1858,7 @@
"fileman/button/properties");
ecore_evas_geometry_get(sd->win->ecore_evas, &x, &y, &w, &h);
-
+
e_menu_activate_mouse(sd->menu, sd->win->border->zone,
ev->output.x + x, ev->output.y + y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
-------------------------------------------------------
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
