discomfitor pushed a commit to branch master.

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

commit 2817bf025be505f3022589cf3708990f8f23fb7d
Author: Mike Blumenkrantz <zm...@samsung.com>
Date:   Fri Feb 7 14:23:55 2014 -0500

    more e_client_resize_begin() improvements: remove comp grab on failure
---
 src/bin/e_client.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 011dc41..6034130 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -4112,21 +4112,25 @@ 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;
+     goto error;
+   if (!_e_client_action_input_win_new(ec)) goto error;
+   _e_client_hook_call(E_CLIENT_HOOK_RESIZE_BEGIN, ec);
+   if (!e_client_util_resizing_get(ec))
+     {
+        _e_client_action_input_win_del(ec->comp);
+        return EINA_FALSE;
+     }
    if (!ec->lock_user_stacking)
      {
         if (e_config->border_raise_on_mouse_action)
           evas_object_raise(ec->frame);
      }
-   ec->resize_mode = mode;
-   _e_client_hook_call(E_CLIENT_HOOK_RESIZE_BEGIN, ec);
-   return e_client_util_resizing_get(ec);
+   return EINA_TRUE;
+error:
+   ec->resize_mode = E_POINTER_RESIZE_NONE;
+   return EINA_FALSE;
 }
 
 

-- 


Reply via email to