enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

edje/map - if user change image size of the image object which is swallwoed and it's map is enabled by the edje then edje needs to update it's uv mapping info 

SVN revision: 76184
This commit is contained in:
ChunEon Park 2012-09-05 09:46:09 +00:00
parent 17d424f6db
commit cdc044c321
3 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
legacy/edje/ChangeLog
View File

@ -599,3 +599,10 @@
* Added nested parts support.
This lets us do nested parts, e.g parts "{ part { part { } } }"
2012-09-05 ChunEon Park (Hermet)
* if user change image size of the image object which is swallowed and
it's map enabled by the edje, then edje needs to update it's uv mapping
info.

7
legacy/edje/src/lib/edje_calc.c
View File

@ -3033,8 +3033,11 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
evas_map_point_image_uv_set(map, 3, 0.0, ih );
}
evas_map_util_3d_rotate(map,
TO_DOUBLE(pf->map.rotation.x), TO_DOUBLE(pf->map.rotation.y), TO_DOUBLE(pf->map.rotation.z),
pf->map.center.x, pf->map.center.y, pf->map.center.z);
TO_DOUBLE(pf->map.rotation.x),
TO_DOUBLE(pf->map.rotation.y),
TO_DOUBLE(pf->map.rotation.z),
pf->map.center.x, pf->map.center.y,
pf->map.center.z);
// calculate light color & position etc. if there is one
if (pf->lighted)

31
legacy/edje/src/lib/edje_util.c
View File

@ -5021,6 +5021,26 @@ _edje_object_part_swallow_changed_hints_cb(void *data, __UNUSED__ Evas *e, __UNU
return;
}
void
_edje_object_part_swallow_image_resize_cb(void *data, __UNUSED__ Evas *e, Evas_Object *obj, __UNUSED__ void *event_info)
{
Edje_Real_Part *rp = data;
Evas_Coord w, h;
if (!rp->chosen_description->map.on) return;
Evas_Map *map = (Evas_Map *) evas_object_map_get(rp->swallowed_object);
if (!map) return;
evas_object_image_size_get(rp->swallowed_object, &w, &h);
evas_map_point_image_uv_set(map, 0, 0, 0);
evas_map_point_image_uv_set(map, 1, w, 0);
evas_map_point_image_uv_set(map, 2, w, h);
evas_map_point_image_uv_set(map, 3, 0, h);
evas_object_map_set(rp->swallowed_object, map);
}
void
_edje_real_part_swallow(Edje_Real_Part *rp,
Evas_Object *obj_swallow,
@ -5062,6 +5082,12 @@ _edje_real_part_swallow(Edje_Real_Part *rp,
_edje_object_part_swallow_changed_hints_cb,
rp);
//If the map is enabled, uv should be updated when image size is changed.
if (!strcmp(evas_object_type_get(rp->swallowed_object), "image"))
evas_object_event_callback_add(obj_swallow, EVAS_CALLBACK_IMAGE_RESIZE,
_edje_object_part_swallow_image_resize_cb,
rp);
if (hints_update)
_edje_real_part_swallow_hints_update(rp);
@ -5099,6 +5125,11 @@ _edje_real_part_swallow_clear(Edje_Real_Part *rp)
EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_edje_object_part_swallow_changed_hints_cb,
rp);
if (!strcmp(evas_object_type_get(rp->swallowed_object), "image"))
evas_object_event_callback_del_full(rp->swallowed_object,
EVAS_CALLBACK_IMAGE_RESIZE,
_edje_object_part_swallow_image_resize_cb,
rp);
evas_object_clip_unset(rp->swallowed_object);
evas_object_data_del(rp->swallowed_object, "\377 edje.swallowing_part");
if (rp->part->mouse_events)