From 73f35d84445a8d9b68a7b7b55af97f5054325cba Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 2 Jun 2014 08:40:43 -0400 Subject: [PATCH] check current client size before rejecting resize moderately certain this will fix T993 and also probably fix T1053 --- src/bin/e_comp_object.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 9bd1365c0..df0cf4e69 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -807,13 +807,15 @@ _e_comp_intercept_resize(void *data, Evas_Object *obj, int w, int h) if ((cw->w == w) && (cw->h == h)) { - if ((cw->ec->w != w) || (cw->ec->h != h)) + if (((cw->ec->w != w) || (cw->ec->h != h)) || + (cw->ec->client.w != w - cw->client_inset.l - cw->client_inset.r) || + (cw->ec->client.h != h - cw->client_inset.t - cw->client_inset.b)) { /* handle case where client tries to resize itself and back very quickly */ - evas_object_smart_callback_call(obj, "client_resize", NULL); cw->ec->w = w, cw->ec->h = h; cw->ec->client.w = w - cw->client_inset.l - cw->client_inset.r; cw->ec->client.h = h - cw->client_inset.t - cw->client_inset.b; + evas_object_smart_callback_call(obj, "client_resize", NULL); } return; }