fix focus FIXME regarding focus-setting on clients from other desks

fix T2259

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 9e0bba1c39b4dd9384bf4960c466cd30687128ed..adcc0e12e5864d317214a4c1af30214ea288d7be 100644 (file)
--- 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);
           }
      }