fix desktop gadget dragging near screen edges

ticket #2108


SVN revision: 83063
This commit is contained in:
Mike Blumenkrantz 2013-01-22 09:39:04 +00:00
parent 68c11dfc68
commit 7923a0937c
3 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,7 @@
2013-01-22 Mike Blumenkrantz
* No longer build illume edj files
* fixed gadget dragging on desktop near screen edges
2013-01-15 Mike Blumenkrantz

1
NEWS
View File

@ -108,3 +108,4 @@ Fixes:
* fixed window border hide bug where after iconification hides leave ghosts
* fixed bug where backlight settings would try to update dummy backlight devices
* Reuse notifications for mixer and battery modules.
* fixed gadget dragging on desktop near screen edges

View File

@ -673,10 +673,8 @@ _gadman_gadcon_dnd_move_cb(E_Gadcon *gc, E_Gadcon_Client *gcc)
evas_object_geometry_get(mover, &ox, &oy, &ow, &oh);
/* don't go out of the screen */
if (x < 0) x = 0;
if (x > (Man->width - ow)) x = Man->width - ow;
if (y < 0) y = 0;
if (y > (Man->height - oh)) y = Man->height - oh;
x = MAX(x, gcc->dx), y = MAX(y, gcc->dy);
x = MIN(x, Man->width - ow + gcc->dx), y = MIN(y, Man->height - ow + gcc->dy);
evas_object_move(gcc->o_frame, x - gcc->dx, y - gcc->dy);
evas_object_move(mover, x - gcc->dx, y - gcc->dy);