[EGIT] [core/enlightenment] master 12/21: only set shape merge/export flags for non-override clients on resize

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

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

commit 2943d880427fdca13eb91d9765c9221e9e8888be
Author: Mike Blumenkrantz <zm...@samsung.com>
Date:   Wed Jan 22 21:36:47 2014 -0500

    only set shape merge/export flags for non-override clients on resize
---
 src/bin/e_comp_object.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 967dae6..522d7f9 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -772,10 +772,13 @@ _e_comp_intercept_resize(void *data, Evas_Object *obj, 
int w, int h)
         //INF("INTERCEPT %dx%d", w, h);
         evas_object_resize(obj, w, h);
      }
-   cw->ec->need_shape_merge |= cw->ec->shaped || cw->ec->shaped_input;
-   cw->ec->need_shape_export |= cw->ec->shaped;
-   if (cw->ec->shaped || cw->ec->shaped_input)
-     EC_CHANGED(cw->ec);
+   if (!cw->ec->override)
+     {
+        cw->ec->need_shape_merge |= cw->ec->shaped || cw->ec->shaped_input;
+        cw->ec->need_shape_export |= cw->ec->shaped;
+        if (cw->ec->shaped || cw->ec->shaped_input)
+          EC_CHANGED(cw->ec);
+     }
 
    /* this fixes positioning jiggles when using a resize mode
     * which also changes the client's position

--