[EGIT] [core/enlightenment] master 01/01: ensure resize is still deferred for changes.shape clients during failed resize

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

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

commit d584c9a09576ab26f1404d5cd9b704ff31aa17a6
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Fri Apr 22 12:13:11 2016 -0400

    ensure resize is still deferred for changes.shape clients during failed 
resize
    
    ref c212bb4e21bd8c1334e02b3550c096ae6283f124
---
 src/bin/e_comp_object.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 25d558d..777c4b8 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -1170,11 +1170,13 @@ _e_comp_intercept_resize(void *data, Evas_Object *obj, 
int w, int h)
         /* shapeless clients smh */
         if (cw->ec->shaped && (!cw->ec->shape_rects)) return;
         /* pending shape change gtfo */
-        if (cw->ec->changes.shape) return;
-        /* client can't be resized if its pixmap isn't usable, try again */
-        e_pixmap_dirty(cw->ec->pixmap);
-        e_comp_object_render_update_add(obj);
-        e_comp_render_queue();
+        if (!cw->ec->changes.shape)
+          {
+             /* client can't be resized if its pixmap isn't usable, try again 
*/
+             e_pixmap_dirty(cw->ec->pixmap);
+             e_comp_object_render_update_add(obj);
+             e_comp_render_queue();
+          }
         cw->ec->changes.size = 1;
         EC_CHANGED(cw->ec);
         return;

--