e_client: meld pass 2 and pass3 into one pass in e_client_idler_before

Change-Id: I15ee1bda8e7f891d0f1af9bdfad9d9a7c3ada99d

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 4b0b893..df18342 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -4215,21 +4215,7 @@ e_client_idler_before(void)
 
         _e_client_hook_call(E_CLIENT_HOOK_EVAL_POST_FRAME_ASSIGN, ec);
      }
-
-   E_CLIENT_FOREACH(ec)
-     {
-        if (ec->ignored) continue;
-        // pass 2 - show windows needing show
-        if ((ec->changes.visible) && (ec->visible) &&
-            (!ec->new_client) && (!ec->changes.pos) &&
-            (!ec->changes.size))
-          {
-             evas_object_show(ec->frame);
-             ec->changes.visible = !evas_object_visible_get(ec->frame);
-          }
-     }
-
-   // pass 3 - hide windows needing hide and eval (main eval)
+   // pass 2 - show and hide windows needing hide and eval (main eval)
    E_CLIENT_FOREACH(ec)
      {
         if (e_object_is_del(E_OBJECT(ec))) continue;
@@ -4245,10 +4231,23 @@ e_client_idler_before(void)
              continue;
           }
 
-        if ((ec->changes.visible) && (!ec->visible))
+        if (ec->changes.visible)
           {
-             evas_object_hide(ec->frame);
-             ec->changes.visible = 0;
+             if (ec->visible)
+               {
+                  if ((!ec->new_client) &&
+                      (!ec->changes.pos) &&
+                      (!ec->changes.size))
+                    {
+                       evas_object_show(ec->frame);
+                       ec->changes.visible = !evas_object_visible_get(ec->frame);
+                    }
+               }
+             else
+               {
+                  evas_object_hide(ec->frame);
+                  ec->changes.visible = 0;
+               }
           }
 
         if (ec->changed)