From e68837c1d613913178538a9a89d5157ff7e955de Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 7 Feb 2014 12:01:12 -0500 Subject: [PATCH] e_client_resize_begin() fixes * make return value accurate * unset resize_mode on failure --- src/bin/e_client.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index 8619cf719..7cd82da96 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -4115,19 +4115,21 @@ e_client_resize_cancel(void) EAPI Eina_Bool e_client_resize_begin(E_Client *ec) { + E_Pointer_Mode mode = ec->resize_mode; + + ec->resize_mode = E_POINTER_RESIZE_NONE; + if ((ec->shaded) || (ec->shading) || + (ec->fullscreen) || (ec->lock_user_size)) + return EINA_FALSE; + if (!_e_client_action_input_win_new(ec)) return EINA_FALSE; if (!ec->lock_user_stacking) { if (e_config->border_raise_on_mouse_action) evas_object_raise(ec->frame); } - if ((ec->shaded) || (ec->shading) || - (ec->fullscreen) || (ec->lock_user_size)) - return EINA_FALSE; - - if (!_e_client_action_input_win_new(ec)) return EINA_FALSE; - - ecresize = ec; - return _e_client_hook_call(E_CLIENT_HOOK_RESIZE_BEGIN, ec); + ec->resize_mode = mode; + _e_client_hook_call(E_CLIENT_HOOK_RESIZE_BEGIN, ec); + return e_client_util_resizing_get(ec); }