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

elementary transit: support image fill area in zoom effect. 

Transit zoom effect didn't care image fill area in case of manual filling.
This additional logic computes map uvs with regards to the current image fill area.

@fix
This commit is contained in:
Hermet Park 2016-11-04 20:19:14 +09:00
parent 132bac98c8
commit c446df487f
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/lib/elementary/elm_transit.c
View File

@ -479,6 +479,9 @@ _recover_image_uv(Evas_Object *obj, Evas_Map *map, Eina_Bool revert, Eina_Bool b
//Since the map is not proper for all types of objects,
//Need to handle uvs only for image objects
int iw, ih;
int x, y, w, h;
int fill_x, fill_y, fill_w, fill_h;
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;
@ -494,10 +497,34 @@ _recover_image_uv(Evas_Object *obj, Evas_Map *map, Eina_Bool revert, Eina_Bool b
}
else
{
evas_map_point_image_uv_set(map, 0, 0, 0);
evas_map_point_image_uv_set(map, 1, iw, 0);
evas_map_point_image_uv_set(map, 2, iw, ih);
evas_map_point_image_uv_set(map, 3, 0, ih);
if (evas_object_image_filled_get(obj))
{
x = 0;
y = 0;
w = iw;
h = ih;
}
//Zooming image fill area.
else
{
efl_gfx_fill_get(obj, &fill_x, &fill_y, &fill_w, &fill_h);
efl_gfx_geometry_get(obj, NULL, NULL, &w, &h);
double rate_x = (double) w / (double) fill_w;
double rate_y = (double) h / (double) fill_h;
double rate_x2 = (double) iw / (double) fill_w;
double rate_y2 = (double) ih / (double) fill_h;
x = -(int)((double) fill_x * rate_x2);
y = -(int)((double) fill_y * rate_y2);
w = (int)(((double) iw) * rate_x) + x;
h = (int)(((double) ih) * rate_y) + y;
}
evas_map_point_image_uv_set(map, 0, x, y);
evas_map_point_image_uv_set(map, 1, w, y);
evas_map_point_image_uv_set(map, 2, w, h);
evas_map_point_image_uv_set(map, 3, x, h);
}
return EINA_TRUE;
}