Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c e_thumb.c
Log Message:
now THIS is cute -watch the thumbnails wobble when generated... or found
cached... most fun! let the power of edje be known! :)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_fm.c 23 Jul 2006 12:14:06 -0000 1.14
+++ e_fm.c 23 Jul 2006 21:19:04 -0000 1.15
@@ -1181,7 +1181,8 @@
edje_object_part_text_set(obj, "label", ic->info.label);
return;
}
- if (ic->sd->config->icon.extension.show)
+ if ((ic->sd->config->icon.extension.show) ||
+ (S_ISDIR(ic->info.statinfo.st_mode)))
edje_object_part_text_set(obj, "label", ic->info.file);
else
{
@@ -1631,7 +1632,24 @@
E_Fm2_Icon *ic;
ic = data;
- edje_object_signal_emit(ic->obj, "thumb", "gen");
+ if (ic->realized)
+ {
+ Evas_Coord w = 0, h = 0;
+ int have_alpha;
+
+ e_icon_size_get(ic->obj_icon, &w, &h);
+ have_alpha = e_icon_alpha_get(ic->obj_icon);
+ if (ic->sd->config->view.mode == E_FM2_VIEW_MODE_LIST)
+ {
+ edje_extern_object_aspect_set(ic->obj_icon,
+ EDJE_ASPECT_CONTROL_BOTH, w, h);
+ }
+ edje_object_part_swallow(ic->obj, "icon_swallow", ic->obj_icon);
+ if (have_alpha)
+ edje_object_signal_emit(ic->obj, "thumb", "gen_alpha");
+ else
+ edje_object_signal_emit(ic->obj, "thumb", "gen");
+ }
}
static void
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_thumb.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- e_thumb.c 23 Jul 2006 14:05:39 -0000 1.35
+++ e_thumb.c 23 Jul 2006 21:19:04 -0000 1.36
@@ -13,6 +13,7 @@
char *key;
unsigned char queued : 1;
unsigned char busy : 1;
+ unsigned char done : 1;
};
/* local subsystem functions */
@@ -123,6 +124,7 @@
if (!eth) return;
if (eth->queued) return;
if (eth->busy) return;
+ if (eth->done) return;
if (!eth->file) return;
if (!_thumbnailers)
{
@@ -199,6 +201,7 @@
{
eth->busy = 0;
_pending--;
+ eth->done = 1;
if (_pending == 0) _e_thumb_thumbnailers_kill();
e_icon_file_key_set(obj, icon, "/thumbnail/data");
evas_object_smart_callback_call(obj, "e_thumb_gen",
NULL);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
