elementary/transit - fix the transit to accept proxy obj

SVN revision: 78669
This commit is contained in:
ChunEon Park 2012-10-30 14:44:34 +00:00
parent 827646a2ab
commit 43b883a15b
3 changed files with 8 additions and 1 deletions

View File

@ -640,3 +640,7 @@
2012-10-25 Michael Bouchaud (yoz)
* some fix for promote and demote in genlist
2012-10-30 ChunEon Park (Hermet)
* Fix the transit to accept proxy object.

View File

@ -46,6 +46,7 @@ Fixes:
* Fix on_focus_region() issue.
* Fixed gengrid wrong_calc_job parameter.
* Fix elm_transit image animation that last few frames are skipped.
* FIx elm_transit to accept proxy object.
Removals:

View File

@ -418,6 +418,7 @@ _recover_image_uv(Evas_Object *obj, Evas_Map *map, Eina_Bool revert, Eina_Bool b
int iw, ih;
const char *type = evas_object_type_get(obj);
if ((!type) || (strcmp(type, "image"))) return EINA_FALSE;
if (evas_object_image_source_get(obj)) return EINA_FALSE;
evas_object_image_size_get(obj, &iw, &ih);
@ -1702,7 +1703,8 @@ _transit_effect_wipe_op(Elm_Transit_Effect *effect, Elm_Transit *transit, double
EINA_LIST_FOREACH(transit->objs, elist, obj)
{
type = evas_object_type_get(obj);
if ((!type) || (strcmp(type, "image")))
if ((!type) || (strcmp(type, "image")) ||
evas_object_image_source_get(obj))
evas_object_geometry_get(obj, &_x, &_y, &_w, &_h);
else
{