mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

desktop-shell: Reject window move in common_surface_move()

Browse Source 
We move the check for shsurf->grabbed from surface_move() and
surface_touch_move() up top common_surface_move()
This commit is contained in:
Kristian Høgsberg
2014-04-29 14:47:46 -07:00
parent 9c60933a13
commit d0b40ed451
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop-shell/shell.c
+3 -4
View File
@@ -1436,8 +1436,6 @@ surface_touch_move(struct shell_surface *shsurf, struct weston_seat *seat)
if (shsurf->state.fullscreen) if (shsurf->state.fullscreen)
return 0; return 0;
if (shsurf->grabbed)
return 0;
move = malloc(sizeof *move); move = malloc(sizeof *move);
if (!move) if (!move)
@@ -1522,8 +1520,6 @@ surface_move(struct shell_surface *shsurf, struct weston_seat *seat)
if (!shsurf) if (!shsurf)
return -1; return -1;
if (shsurf->grabbed)
return 0;
if (shsurf->state.fullscreen || shsurf->state.maximized) if (shsurf->state.fullscreen || shsurf->state.maximized)
return 0; return 0;
@@ -1550,6 +1546,9 @@ common_surface_move(struct wl_resource *resource,
struct shell_surface *shsurf = wl_resource_get_user_data(resource); struct shell_surface *shsurf = wl_resource_get_user_data(resource);
struct weston_surface *surface; struct weston_surface *surface;
if (shsurf->grabbed)
return;
if (seat->pointer && if (seat->pointer &&
seat->pointer->focus && seat->pointer->focus &&
seat->pointer->button_count > 0 && seat->pointer->button_count > 0 &&