shell: block move, rotate, resize in maximized state

To remain consisten with client side window, which blocks moving and
resizing of window in maximized state, we should do so on the compositor
side as well.

(until there is some unmaximize notification from server, which will
allow window to start drawing shadows and revert itself to toplevel
state)
dev
Rafal Mielniczuk 12 years ago committed by Kristian Høgsberg
parent f3e39f9872
commit 23c6759b76
  1. 12
      src/shell.c

@ -1174,7 +1174,8 @@ surface_resize(struct shell_surface *shsurf,
{ {
struct weston_resize_grab *resize; struct weston_resize_grab *resize;
if (shsurf->type == SHELL_SURFACE_FULLSCREEN) if (shsurf->type == SHELL_SURFACE_FULLSCREEN ||
shsurf->type == SHELL_SURFACE_MAXIMIZED)
return 0; return 0;
if (edges == 0 || edges > 15 || if (edges == 0 || edges > 15 ||
@ -2387,7 +2388,8 @@ move_binding(struct wl_seat *seat, uint32_t time, uint32_t button, void *data)
return; return;
shsurf = get_shell_surface(surface); shsurf = get_shell_surface(surface);
if (shsurf == NULL || shsurf->type == SHELL_SURFACE_FULLSCREEN) if (shsurf == NULL || shsurf->type == SHELL_SURFACE_FULLSCREEN ||
shsurf->type == SHELL_SURFACE_MAXIMIZED)
return; return;
surface_move(shsurf, (struct weston_seat *) seat); surface_move(shsurf, (struct weston_seat *) seat);
@ -2406,7 +2408,8 @@ resize_binding(struct wl_seat *seat, uint32_t time, uint32_t button, void *data)
return; return;
shsurf = get_shell_surface(surface); shsurf = get_shell_surface(surface);
if (!shsurf || shsurf->type == SHELL_SURFACE_FULLSCREEN) if (!shsurf || shsurf->type == SHELL_SURFACE_FULLSCREEN ||
shsurf->type == SHELL_SURFACE_MAXIMIZED)
return; return;
weston_surface_from_global(surface, weston_surface_from_global(surface,
@ -2665,7 +2668,8 @@ rotate_binding(struct wl_seat *seat, uint32_t time, uint32_t button,
return; return;
surface = get_shell_surface(base_surface); surface = get_shell_surface(base_surface);
if (!surface || surface->type == SHELL_SURFACE_FULLSCREEN) if (!surface || surface->type == SHELL_SURFACE_FULLSCREEN ||
surface->type == SHELL_SURFACE_MAXIMIZED)
return; return;
surface_rotate(surface, seat); surface_rotate(surface, seat);

Loading…
Cancel
Save