[PATCH] shell: don't assign output for surface of type none

[Kristian Hoegsberg]

On Mon, Mar 05, 2012 at 03:39:23PM +0200, Ander Conselvan de Oliveira wrote:
> 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.

Oops, sorry.  Applied.
Kristian

> ---
>  src/shell.c |   10 ++++++----
>  1 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/src/shell.c b/src/shell.c
> index ac7301a..2611316 100644
> --- a/src/shell.c
> +++ b/src/shell.c
> @@ -1603,10 +1603,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:
> -- 
> 1.7.5.4
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel