shell: don't assign output for surface of type none
If map is called with a surface of type none it will call weston_surface_assign_output, even though the surface will not be mapped. This change was lost with the changes for using wl_layers.
This commit is contained in:
parent
9c35e6b47d
commit
de56c311d9
10
src/shell.c
10
src/shell.c
@ -1582,10 +1582,12 @@ map(struct weston_shell *base, struct weston_surface *surface,
|
||||
break;
|
||||
}
|
||||
|
||||
weston_surface_assign_output(surface);
|
||||
weston_compositor_repick(compositor);
|
||||
if (surface_type == SHELL_SURFACE_MAXIMIZED)
|
||||
surface->output = shsurf->output;
|
||||
if (surface_type != SHELL_SURFACE_NONE) {
|
||||
weston_surface_assign_output(surface);
|
||||
weston_compositor_repick(compositor);
|
||||
if (surface_type == SHELL_SURFACE_MAXIMIZED)
|
||||
surface->output = shsurf->output;
|
||||
}
|
||||
|
||||
switch (surface_type) {
|
||||
case SHELL_SURFACE_TOPLEVEL:
|
||||
|
Loading…
Reference in New Issue
Block a user