summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2015-10-22 19:25:07 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-11-09 14:04:24 -0500
commitdfa3b4060c425898000d098950bdd810a439ec27 (patch)
tree0f3d5e22191e156858a439429a1ca4ea787826c8
parent90b0708fb11ddbf8e528d6295ae2980df3a967cf (diff)
downloadenlightenment-dfa3b4060c425898000d098950bdd810a439ec27.tar.gz
only apply frame geometry deltas for CSD if the CSD region exists
ref e931e86161d7f419e44652b533fea4dc9b16241b
-rw-r--r--src/bin/e_comp_object.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index aa18c1672f..5e16ef7252 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -2800,12 +2800,18 @@ e_comp_object_frame_geometry_set(Evas_Object *obj, int l, int r, int t, int b)
(cw->client_inset.t == t) && (cw->client_inset.b == b)) return;
cw->client_inset.calc = l || r || t || b;
eina_stringshare_replace(&cw->frame_theme, "borderless");
- cw->ec->w += (l + r) - (cw->client_inset.l + cw->client_inset.r);
- cw->ec->h += (t + b) - (cw->client_inset.t + cw->client_inset.b);
+ if (cw->client_inset.calc)
+ {
+ cw->ec->w += (l + r) - (cw->client_inset.l + cw->client_inset.r);
+ cw->ec->h += (t + b) - (cw->client_inset.t + cw->client_inset.b);
+ }
if (!cw->ec->new_client)
{
- cw->ec->x -= l - cw->client_inset.l;
- cw->ec->y -= t - cw->client_inset.t;
+ if (cw->client_inset.calc)
+ {
+ cw->ec->x -= l - cw->client_inset.l;
+ cw->ec->y -= t - cw->client_inset.t;
+ }
cw->ec->changes.pos = cw->ec->changes.size = 1;
EC_CHANGED(cw->ec);
}