From 2943d880427fdca13eb91d9765c9221e9e8888be Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 22 Jan 2014 21:36:47 -0500 Subject: [PATCH] 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 967dae61f..522d7f949 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