mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Ander Conselvan de Oliveira 2012-03-05 15:39:23 +02:00 committed by Kristian Høgsberg
parent 9c35e6b47d
commit de56c311d9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/shell.c
View File

@ -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: