From 60269f3ecfc648bee3e7d81cad8f27874b98a0c3 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 24 Nov 2015 17:31:47 -0500 Subject: [PATCH] use CSD geometry during move/resize display this should provide more user-relevant information --- src/bin/e_moveresize.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/bin/e_moveresize.c b/src/bin/e_moveresize.c index d78d65bdf..9b9ce8e4c 100644 --- a/src/bin/e_moveresize.c +++ b/src/bin/e_moveresize.c @@ -56,28 +56,24 @@ e_moveresize_replace(Eina_Bool enable) E_API void e_moveresize_client_extents(const E_Client *ec, int *w, int *h) { + if (e_comp_object_frame_allowed(ec->frame)) + *w = ec->client.w, *h = ec->client.h; + else + *w = ec->w, *h = ec->h; if ((ec->icccm.base_w >= 0) && (ec->icccm.base_h >= 0)) { if (ec->icccm.step_w > 0) - *w = (ec->client.w - ec->icccm.base_w) / ec->icccm.step_w; - else - *w = ec->client.w; + *w = (*w - ec->icccm.base_w) / ec->icccm.step_w; if (ec->icccm.step_h > 0) - *h = (ec->client.h - ec->icccm.base_h) / ec->icccm.step_h; - else - *h = ec->client.h; + *h = (*h - ec->icccm.base_h) / ec->icccm.step_h; } else { if (ec->icccm.step_w > 0) - *w = (ec->client.w - ec->icccm.min_w) / ec->icccm.step_w; - else - *w = ec->client.w; + *w = (*w - ec->icccm.min_w) / ec->icccm.step_w; if (ec->icccm.step_h > 0) - *h = (ec->client.h - ec->icccm.min_h) / ec->icccm.step_h; - else - *h = ec->client.h; + *h = (*h - ec->icccm.min_h) / ec->icccm.step_h; } }