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

Really cancel move/resize 

SVN revision: 54274
This commit is contained in:
Sebastian Dransfeld 2010-11-07 12:34:29 +00:00
parent 48e98291bd
commit 3678c820b9
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/bin/e_border.c
View File

@ -3532,7 +3532,20 @@ e_border_ping(E_Border *bd)
EAPI void EAPI void
e_border_move_cancel(void) e_border_move_cancel(void)
{ {
if (move) _e_border_move_end(move); if (move)
{
if (move->cur_mouse_action)
{
if (move->cur_mouse_action->func.end_mouse)
move->cur_mouse_action->func.end_mouse(E_OBJECT(move), "", NULL);
else if (move->cur_mouse_action->func.end)
move->cur_mouse_action->func.end(E_OBJECT(move), "");
e_object_unref(E_OBJECT(move->cur_mouse_action));
move->cur_mouse_action = NULL;
}
else
_e_border_move_end(move);
}
} }
EAPI void EAPI void
@ -3540,8 +3553,20 @@ e_border_resize_cancel(void)
{ {
if (resize) if (resize)
{ {
resize->resize_mode = RESIZE_NONE; if (resize->cur_mouse_action)
_e_border_resize_end(resize); {
if (resize->cur_mouse_action->func.end_mouse)
resize->cur_mouse_action->func.end_mouse(E_OBJECT(move), "", NULL);
else if (resize->cur_mouse_action->func.end)
resize->cur_mouse_action->func.end(E_OBJECT(move), "");
e_object_unref(E_OBJECT(resize->cur_mouse_action));
resize->cur_mouse_action = NULL;
}
else
{
resize->resize_mode = RESIZE_NONE;
_e_border_resize_end(resize);
}
} }
} }