e-modules/comp-scale: dont start moving border when mouse up comes before animation ends

SVN revision: 57951
This commit is contained in:
Hannes Janetzek 2011-03-22 00:57:20 +00:00
parent 3c84da38e7
commit 5328254f42
1 changed files with 8 additions and 3 deletions

View File

@ -519,9 +519,6 @@ _scale_win_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info
if (!it || !it->mouse_down)
return;
if (it->bd->maximized || it->bd->fullscreen || it->bd->lock_user_location)
return;
if (it->moved)
{
it->bd_x += (ev->cur.canvas.x - ev->prev.canvas.x);
@ -533,6 +530,9 @@ _scale_win_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info
}
else
{
if (it->bd->maximized || it->bd->fullscreen || it->bd->lock_user_location)
return;
if (abs(ev->cur.canvas.x - it->mx) +
abs(ev->cur.canvas.y - it->my) < 15)
return;
@ -1266,6 +1266,11 @@ _scale_cb_mouse_up(void *data, int type, void *event)
if (ev->window != input_win)
return ECORE_CALLBACK_PASS_ON;
if (selected_item)
{
selected_item->moved = EINA_FALSE;
}
if (bd_move)
{
Ecore_Event_Handler *handler;