diff options
author | Kristian Høgsberg <krh@bitplanet.net> | 2014-01-01 13:51:52 -0800 |
---|---|---|
committer | Kristian Høgsberg <krh@bitplanet.net> | 2014-01-01 13:51:52 -0800 |
commit | ead5242e0719d758b65465379f9b5be570426b38 (patch) | |
tree | 176a273c134002f9a7f726b5e26289c459ad3578 | |
parent | d55db69c949899eb2a878f970ae1e01bb2c832b8 (diff) |
shell: Fix up previous broken commit
-rw-r--r-- | desktop-shell/shell.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index b56f3978..2019a4ef 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -1971,10 +1971,11 @@ static struct wl_list * shell_surface_calculate_layer_link (struct shell_surface *shsurf) { struct workspace *ws; + struct weston_view *parent; switch (shsurf->type) { - case SHELL_SURFACE_POPUP: { - case SHELL_SURFACE_TOPLEVEL: { + case SHELL_SURFACE_POPUP: + case SHELL_SURFACE_TOPLEVEL: if (shsurf->state.fullscreen) { return &shsurf->shell->fullscreen_layer.view_list; } else if (shsurf->parent) { @@ -1982,7 +1983,6 @@ shell_surface_calculate_layer_link (struct shell_surface *shsurf) * that surfaces which are transient for * fullscreen surfaces don't get hidden by the * fullscreen surfaces. */ - struct weston_view *parent; /* TODO: Handle a parent with multiple views */ parent = get_default_view(shsurf->parent); @@ -1990,7 +1990,6 @@ shell_surface_calculate_layer_link (struct shell_surface *shsurf) return parent->layer_link.prev; } break; - } case SHELL_SURFACE_XWAYLAND: return &shsurf->shell->fullscreen_layer.view_list; |