[EGIT] [core/enlightenment] master 01/02: block all desk flips during window resize

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=5dc267ec8419b2f843946180c79ec91f8f7dc4e6

commit 5dc267ec8419b2f843946180c79ec91f8f7dc4e6
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Wed Sep 6 13:14:13 2017 -0400

    block all desk flips during window resize
    
    this breaks *
    
    fix T5984
---
 src/bin/e_actions.c | 1 +
 src/bin/e_desk.c    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index a118d7888..80f829597 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -1417,6 +1417,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
    int x, y, offset = 25;
 
    if (!ev) return;  // with flip on _e_zone_cb_edge_timer we don't have ev!!!
+   if (e_client_action_get() && 
e_client_util_resizing_get(e_client_action_get())) return;
    zone = _e_actions_zone_get(obj);
    if (!zone) return;
    wev = E_NEW(E_Event_Pointer_Warp, 1);
diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 5d1c41276..99d53ec57 100644
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -255,6 +255,7 @@ e_desk_show(E_Desk *desk)
    E_OBJECT_CHECK(desk);
    E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
    if (desk->visible) return;
+   if (e_client_action_get() && 
e_client_util_resizing_get(e_client_action_get())) return;
 
    desk2 = e_desk_at_xy_get(desk->zone, desk->zone->desk_x_current, 
desk->zone->desk_y_current);
    if ((!starting) && (!desk2->visible)) return;

--