[EGIT] [core/enlightenment] enlightenment-0.19 03/07: fix focus FIXME regarding focus-setting on clients from other desks

[Mike Blumenkrantz]

discomfitor pushed a commit to branch enlightenment-0.19.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=a491a3fa9ed128c9521217b115138f861d7c4fd2

commit a491a3fa9ed128c9521217b115138f861d7c4fd2
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Mon Jun 29 15:47:57 2015 -0400

    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 f10d34e..a8a48fb 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -1442,12 +1442,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);
           }
      }
 

--