summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2014-04-29 14:50:25 -0700
committerKristian Høgsberg <krh@bitplanet.net>2014-04-29 14:50:25 -0700
commit7b83ae433f9f373e211020b92e4a2877b413d8d7 (patch)
tree54cb5f2e81232501e77bbc7a329b55c56dfd5374
parentd0b40ed4513a831c6fc0d5cb2751309b13bc8fae (diff)
downloadweston-7b83ae433f9f373e211020b92e4a2877b413d8d7.tar.gz
desktop-shell: Reject resize if we're already grabbed
This rejects resizing a window that's currently being moved. This can be done using a touch screen and a pointer or just two seats.
-rw-r--r--desktop-shell/shell.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 9340b4ac..79bd65c1 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -1742,6 +1742,9 @@ common_surface_resize(struct wl_resource *resource,
if (shsurf->state.fullscreen)
return;
+ if (shsurf->grabbed)
+ return;
+
if (seat->pointer->button_count == 0 ||
seat->pointer->grab_serial != serial ||
seat->pointer->focus == NULL)