[EGIT] [core/enlightenment] master 25/34: replace existing resize pointer mode for x11 client-initiated resizes

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=121e7fab4b13de85ac310b0e47d067b6fa16b7b8

commit 121e7fab4b13de85ac310b0e47d067b6fa16b7b8
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Fri Aug 18 15:52:52 2017 -0400

    replace existing resize pointer mode for x11 client-initiated resizes
    
    ensure there is no mismatch between pointer modes when pushing/popping modes
    
    fix T4893
---
 src/bin/e_comp_x.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 1a496ca29..e73b7a341 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -2837,45 +2837,43 @@ _e_comp_x_move_resize_request(void *data EINA_UNUSED, 
int type EINA_UNUSED, Ecor
    e_object_ref(E_OBJECT(ec->cur_mouse_action));
    ec->cur_mouse_action->func.go(E_OBJECT(ec), NULL);
 
+   if (ev->direction != E_POINTER_RESIZE_NONE)
+     {
+        e_pointer_mode_pop(ec, ec->resize_mode);
+        ec->resize_mode = ev->direction;
+        e_pointer_mode_push(ec, ec->resize_mode);
+     }
    switch (ev->direction)
      {
       case E_POINTER_RESIZE_TL:
-        ec->resize_mode = E_POINTER_RESIZE_TL;
         GRAV_SET(ec, ECORE_X_GRAVITY_SE);
         break;
 
       case E_POINTER_RESIZE_T:
-        ec->resize_mode = E_POINTER_RESIZE_T;
         GRAV_SET(ec, ECORE_X_GRAVITY_S);
         break;
 
       case E_POINTER_RESIZE_TR:
-        ec->resize_mode = E_POINTER_RESIZE_TR;
         GRAV_SET(ec, ECORE_X_GRAVITY_SW);
         break;
 
       case E_POINTER_RESIZE_R:
-        ec->resize_mode = E_POINTER_RESIZE_R;
         GRAV_SET(ec, ECORE_X_GRAVITY_W);
         break;
 
       case E_POINTER_RESIZE_BR:
-        ec->resize_mode = E_POINTER_RESIZE_BR;
         GRAV_SET(ec, ECORE_X_GRAVITY_NW);
         break;
 
       case E_POINTER_RESIZE_B:
-        ec->resize_mode = E_POINTER_RESIZE_B;
         GRAV_SET(ec, ECORE_X_GRAVITY_N);
         break;
 
       case E_POINTER_RESIZE_BL:
-        ec->resize_mode = E_POINTER_RESIZE_BL;
         GRAV_SET(ec, ECORE_X_GRAVITY_NE);
         break;
 
       case E_POINTER_RESIZE_L:
-        ec->resize_mode = E_POINTER_RESIZE_L;
         GRAV_SET(ec, ECORE_X_GRAVITY_E);
         break;
 

--