discomfitor pushed a commit to branch master.
commit 8e0fd0bf4b5ff02507e5f0d6a14fd03b80d8dce4
Author: Mike Blumenkrantz <[email protected]>
Date: Tue Jul 2 09:03:02 2013 +0100
if the warping border gets a modal window during the warp, do nothing after
the warp
---
src/bin/e_border.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index a709fc7..a59d7ea 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -9955,6 +9955,11 @@ cleanup:
if (warp_timer_border)
{
warp_x[0] = warp_x[1] = warp_y[0] = warp_y[1] = -1;
+ if (warp_timer_border->modal)
+ {
+ warp_timer_border = NULL;
+ return ECORE_CALLBACK_CANCEL;
+ }
e_focus_event_mouse_in(warp_timer_border);
if (warp_timer_border->iconic)
{
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
