aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-09-06 13:14:13 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-09-07 14:15:30 -0400
commit92b23f0d6d04222502949d3dd32b2538b7c3429b (patch)
tree88ea6260297bd294644907be39d6c1fa5f1d49bc
parentreset zone edge objects after comp canvas update (diff)
downloadenlightenment-92b23f0d6d04222502949d3dd32b2538b7c3429b.tar.gz
block all desk flips during window resize
-rw-r--r--src/bin/e_actions.c1
-rw-r--r--src/bin/e_desk.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index b6ca4301a..cb25819e2 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -1402,6 +1402,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 dec696afa..61c1573c2 100644
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -257,6 +257,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;