[EGIT] [core/enlightenment] master 02/03: wl clients should not use edges during keyboard resize

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=7859787f7387f081b689366df2abbd150a13c0c2

commit 7859787f7387f081b689366df2abbd150a13c0c2
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Wed Jul 15 18:08:32 2015 -0400

    wl clients should not use edges during keyboard resize
    
    ref T2452
---
 src/bin/e_comp_wl.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 5bf4c43..0e49c5b 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -552,7 +552,7 @@ _e_comp_wl_evas_cb_resize(void *data, Evas_Object *obj 
EINA_UNUSED, void *event
 
    if ((ec->shading) || (ec->shaded)) return;
    if (!ec->comp_data->shell.configure_send) return;
-   if (e_client_util_resizing_get(ec))
+   if (e_client_util_resizing_get(ec) && e_comp->wl_comp_data->resize.edges)
      {
         int x, y, ax, ay;
 
@@ -2414,6 +2414,8 @@ _e_comp_wl_client_cb_resize_begin(void *data EINA_UNUSED, 
E_Client *ec)
 {
    if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
 
+   e_comp->wl_comp_data->resize.edges = 0;
+   if (ec->keyboard_resizing) return;
    switch (ec->resize_mode)
      {
       case E_POINTER_RESIZE_T: // 1
@@ -2441,7 +2443,6 @@ _e_comp_wl_client_cb_resize_begin(void *data EINA_UNUSED, 
E_Client *ec)
         e_comp->wl_comp_data->resize.edges = 10;
         break;
       default:
-        e_comp->wl_comp_data->resize.edges = 0;
         break;
      }
 }

--