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

fix buglet in inlined image buffer canvas -> coords repeated when 

dragged outside the bounds.



SVN revision: 58628
This commit is contained in:
Carsten Haitzler 2011-04-13 12:05:31 +00:00
parent caa46dc1ba
commit 7a2fd8c67d
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
legacy/ecore/src/lib/ecore_evas/ecore_evas_buffer.c
View File

@ -140,22 +140,31 @@ _ecore_evas_buffer_render(Ecore_Evas *ee)
static void
_ecore_evas_buffer_coord_translate(Ecore_Evas *ee, Evas_Coord *x, Evas_Coord *y)
{
Evas_Coord xx, yy, fx, fy, fw, fh;
Evas_Coord xx, yy, ww, hh, fx, fy, fw, fh;
evas_object_geometry_get(ee->engine.buffer.image, &xx, &yy, NULL, NULL);
evas_object_geometry_get(ee->engine.buffer.image, &xx, &yy, &ww, &hh);
evas_object_image_fill_get(ee->engine.buffer.image, &fx, &fy, &fw, &fh);
if (fw < 1) fw = 1;
xx = (*x - xx) - fx;
while (xx < 0) xx += fw;
while (xx > fw) xx -= fw;
*x = (ee->w * xx) / fw;
if (fh < 1) fh = 1;
yy = (*y - yy) - fy;
while (yy < 0) yy += fh;
while (yy > fh) yy -= fh;
*y = (ee->h * yy) / fh;
if ((fx == 0) && (fy == 0) && (fw == ww) && (fh == hh))
{
*x = (ee->w * *x) / fw;
*y = (ee->h * *y) / fh;
}
else
{
xx = (*x - xx) - fx;
while (xx < 0) xx += fw;
while (xx > fw) xx -= fw;
*x = (ee->w * xx) / fw;
yy = (*y - yy) - fy;
while (yy < 0) yy += fh;
while (yy > fh) yy -= fh;
*y = (ee->h * yy) / fh;
}
}
static void
@ -213,7 +222,9 @@ _ecore_evas_buffer_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *ob
ev = event_info;
x = ev->cur.canvas.x;
y = ev->cur.canvas.y;
printf("%i %i\n", x, y);
_ecore_evas_buffer_coord_translate(ee, &x, &y);
printf(" -> %i %i\n", x, y);
_ecore_evas_mouse_move_process(ee, x, y, ev->timestamp);
}