e17: backport r83720.

SVN revision: 83721
This commit is contained in:
Cedric BAIL 2013-02-07 08:42:24 +00:00
parent a3bc3f6ccc
commit 3c03512f56
3 changed files with 18 additions and 1 deletions

View File

@ -1,3 +1,7 @@
2013-02-07 Cedric Bail
* enable image preloading for all e_widget_preview using edje
2013-02-07 Carsten Haitzler 2013-02-07 Carsten Haitzler
* fix clock timerfd usage to actually detect a date change. * fix clock timerfd usage to actually detect a date change.

1
NEWS
View File

@ -28,6 +28,7 @@ Fixes:
* moved "allow windows above fullscreen windows" option to geometry settings dialog * moved "allow windows above fullscreen windows" option to geometry settings dialog
* fix filemanager efreet cache listeners and updates * fix filemanager efreet cache listeners and updates
* fix clock timerfd usage to actually detect date changes * fix clock timerfd usage to actually detect date changes
* enable image preloading for all e_widget_preview using edje
Changes since 0.17.0: Changes since 0.17.0:

View File

@ -167,6 +167,16 @@ e_widget_preview_file_get(Evas_Object *obj, const char **file, const char **grou
edje_object_file_get(wd->o_thumb, file, group); edje_object_file_get(wd->o_thumb, file, group);
} }
static void
_e_widget_preview_edje_preloaded(void *data, Evas_Object *obj,
const char *emission EINA_UNUSED,
const char *source EINA_UNUSED)
{
E_Widget_Data *wd = data;
evas_object_show(wd->o_thumb);
}
EAPI int EAPI int
e_widget_preview_edje_set(Evas_Object *obj, const char *file, const char *group) e_widget_preview_edje_set(Evas_Object *obj, const char *file, const char *group)
{ {
@ -177,7 +187,9 @@ e_widget_preview_edje_set(Evas_Object *obj, const char *file, const char *group)
if (wd->o_thumb) evas_object_del(wd->o_thumb); if (wd->o_thumb) evas_object_del(wd->o_thumb);
wd->o_thumb = edje_object_add(e_livethumb_evas_get(wd->img)); wd->o_thumb = edje_object_add(e_livethumb_evas_get(wd->img));
ret = edje_object_file_set(wd->o_thumb, file, group); ret = edje_object_file_set(wd->o_thumb, file, group);
evas_object_show(wd->o_thumb); edje_object_signal_callback_add(wd->o_thumb,
"preload,done", "",
_e_widget_preview_edje_preloaded, wd);
e_livethumb_thumb_set(wd->img, wd->o_thumb); e_livethumb_thumb_set(wd->img, wd->o_thumb);
e_widget_change(obj); e_widget_change(obj);