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

shell: Fix up previous broken commit

Browse Source
This commit is contained in:
Kristian Høgsberg
2014-01-01 13:51:52 -08:00
parent d55db69c94
commit ead5242e07
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
@@ -1971,10 +1971,11 @@ static struct wl_list *
shell_surface_calculate_layer_link (struct shell_surface *shsurf) shell_surface_calculate_layer_link (struct shell_surface *shsurf)
{ {
struct workspace *ws; struct workspace *ws;
struct weston_view *parent;
switch (shsurf->type) { switch (shsurf->type) {
case SHELL_SURFACE_POPUP: { case SHELL_SURFACE_POPUP:
case SHELL_SURFACE_TOPLEVEL: { case SHELL_SURFACE_TOPLEVEL:
if (shsurf->state.fullscreen) { if (shsurf->state.fullscreen) {
return &shsurf->shell->fullscreen_layer.view_list; return &shsurf->shell->fullscreen_layer.view_list;
} else if (shsurf->parent) { } else if (shsurf->parent) {
@@ -1982,7 +1983,6 @@ shell_surface_calculate_layer_link (struct shell_surface *shsurf)
* that surfaces which are transient for * that surfaces which are transient for
* fullscreen surfaces don't get hidden by the * fullscreen surfaces don't get hidden by the
* fullscreen surfaces. */ * fullscreen surfaces. */
struct weston_view *parent;
/* TODO: Handle a parent with multiple views */ /* TODO: Handle a parent with multiple views */
parent = get_default_view(shsurf->parent); parent = get_default_view(shsurf->parent);
@@ -1990,7 +1990,6 @@ shell_surface_calculate_layer_link (struct shell_surface *shsurf)
return parent->layer_link.prev; return parent->layer_link.prev;
} }
break; break;
}
case SHELL_SURFACE_XWAYLAND: case SHELL_SURFACE_XWAYLAND:
return &shsurf->shell->fullscreen_layer.view_list; return &shsurf->shell->fullscreen_layer.view_list;