From 58256b851e6f6dea933748ec72161dc564cd54ae Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@osg.samsung.com>
Date: Mon, 29 Jun 2015 15:47:57 -0400
Subject: [PATCH] fix focus FIXME regarding focus-setting on clients from other
 desks

fix T2259
---
 src/bin/e_comp_object.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 9e0bba1c3..adcc0e12e 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -1548,12 +1548,10 @@ _e_comp_intercept_focus(void *data, Evas_Object *obj, Eina_Bool focus)
           {
              return;
           }
-        /* FIXME: hack for deskflip animation:
-         * dont update focus when sliding previous desk */
-        if ((!ec->sticky) && (ec->desk) &&
-            (ec->desk != e_desk_current_get(ec->desk->zone)))
+        if ((!ec->sticky) && (ec->desk) && (!ec->desk->visible))
           {
-             return;
+             if (ec->desk->animate_count) return;
+             e_desk_show(ec->desk);
           }
      }