block all desk flips during window resize

this breaks *

fix T5984
This commit is contained in:
Mike Blumenkrantz 2017-09-06 13:14:13 -04:00
parent c21c282483
commit 5dc267ec84
2 changed files with 2 additions and 0 deletions

View File

@ -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);

View File

@ -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;