projects
/
platform
/
upstream
/
weston.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d0b40ed
)
desktop-shell: Reject resize if we're already grabbed
author
Kristian Høgsberg
<krh@bitplanet.net>
Tue, 29 Apr 2014 21:50:25 +0000
(14:50 -0700)
committer
Kristian Høgsberg
<krh@bitplanet.net>
Tue, 29 Apr 2014 21:50:25 +0000
(14:50 -0700)
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.
desktop-shell/shell.c
patch
|
blob
|
history
diff --git
a/desktop-shell/shell.c
b/desktop-shell/shell.c
index
9340b4a
..
79bd65c
100644
(file)
--- 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)