discomfitor pushed a commit to branch master.

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

commit ea3439b664eb1f325fb69291803372be1bc552fa
Author: Mike Blumenkrantz <[email protected]>
Date:   Thu Mar 27 17:01:22 2014 -0400

    Revert "move comp object tiler creation to helper function to catch retries"
    
    This reverts commit f4e4b2fc4f0e9a1741f11bc945fb72c4b137ff9c.
    
    testing commit that wasn't supposed to go upstream
---
 src/bin/e_comp_object.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 49fdd27..9c5fce0 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -1246,12 +1246,6 @@ _e_comp_intercept_show_helper(E_Comp_Object *cw)
         EC_CHANGED(cw->ec);
         return;
      }
-
-   if ((!cw->ec->input_only) && (!cw->ec->ignored) && (!cw->updates))
-     {
-        cw->updates = eina_tiler_new(cw->ec->client.w, cw->ec->client.h);
-        eina_tiler_tile_size_set(cw->updates, 1, 1);
-     }
    if (cw->ec->input_only)
      {
         cw->real_hid = 0;
@@ -1326,6 +1320,12 @@ _e_comp_intercept_show(void *data, Evas_Object *obj 
EINA_UNUSED)
 #endif
         cw->redirected = 1;
         evas_object_color_set(cw->clip, ec->netwm.opacity, ec->netwm.opacity, 
ec->netwm.opacity, ec->netwm.opacity);
+
+        if ((!cw->ec->input_only) && (!cw->ec->ignored))
+          {
+             cw->updates = eina_tiler_new(cw->ec->client.w, cw->ec->client.h);
+             eina_tiler_tile_size_set(cw->updates, 1, 1);
+          }
      }
 
    _e_comp_intercept_show_helper(cw);

-- 


Reply via email to