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

Merge branch 'master' of ssh://git.enlightenment.org/core/efl

This commit is contained in:
ChunEon Park 2014-08-14 13:15:22 +09:00
parent d08dd13d3d b4d013d2ec
commit e8c3905e2c
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/evas/canvas/evas_object_grid.c
View File

@ -208,7 +208,7 @@ _evas_object_grid_smart_calculate(Evas_Object *o)
{
Eina_List *l;
Evas_Object_Grid_Option *opt;
Evas_Coord x, y, w, h, vw, vh, t;
Evas_Coord x, y, w, h, vw, vh;
Eina_Bool mirror;
EVAS_OBJECT_GRID_DATA_GET_OR_RETURN(o, priv);
@ -222,15 +222,18 @@ _evas_object_grid_smart_calculate(Evas_Object *o)
{
Evas_Coord x1, y1, x2, y2;
x1 = x + ((w * opt->x) / vw);
y1 = y + ((h * opt->y) / vh);
x2 = x + ((w * (opt->x + opt->w)) / vw);
y2 = y + ((h * (opt->y + opt->h)) / vh);
if (mirror)
if (!mirror)
{
t = x1; x1 = x2; x2 = t;
t = y1; y1 = y2; y2 = t;
x1 = x + ((w * opt->x) / vw);
x2 = x + ((w * (opt->x + opt->w)) / vw);
}
else
{
x1 = x + ((w * (vw - (opt->x + opt->w))) / vw);
x2 = x + ((w * (vw - opt->x)) / vw);
}
y1 = y + ((h * opt->y) / vh);
y2 = y + ((h * (opt->y + opt->h)) / vh);
evas_object_move(opt->obj, x1, y1);
evas_object_resize(opt->obj, x2 - x1, y2 - y1);
}