dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elm_image: Fixed to have exact size using elm_image_fill_outside_set() 

Summary:
There was a problem that image is stretched over its size
when elm_image_fill_outside_set() is applied.
This patch fixed that.

@fix

Reviewers: Hermet

Subscribers: Hermet

Differential Revision: https://phab.enlightenment.org/D1854
This commit is contained in:
Jee-Yong Um 2015-01-08 15:47:24 +09:00 committed by ChunEon Park
parent a87021aba0
commit 4ade3552db
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
legacy/elementary/src/lib/elm_image.c
View File

@ -180,15 +180,24 @@ _elm_image_internal_sizing_eval(Evas_Object *obj, Elm_Image_Data *sd)
offset_w = ((sd->img_w - w) * alignh);
offset_h = ((sd->img_h - h) * alignv);
x = sd->img_x + offset_w;
y = sd->img_y + offset_h;
if (sd->aspect_fixed && !sd->fill_inside)
{
evas_object_image_fill_set(sd->img, offset_w, offset_h, w, h);
w = sd->img_w;
h = sd->img_h;
x = sd->img_x;
y = sd->img_y;
}
else
{
evas_object_image_fill_set(sd->img, 0, 0, w, h);
x = sd->img_x + offset_w;
y = sd->img_y + offset_h;
}
evas_object_move(sd->img, x, y);
evas_object_image_fill_set(sd->img, 0, 0, w, h);
if (offset_w < 0) w += offset_w;
if (offset_h < 0) h += offset_h;
evas_object_resize(sd->img, w, h);
}
evas_object_move(sd->hit_rect, x, y);