[PATCH weston 1/2] shell: fix positioning of maximized surfaces with a custom geometry

[Bryce Harrington]

On Fri, Jan 09, 2015 at 08:10:45PM +0200, Giulio Camuffo wrote:
> ---
>  desktop-shell/shell.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)

Applied this first patch to trunk.

   237a684..7a8d67d  master -> master

The second one adds a warning to the build, but otherwise looks good and
I'll apply it once that warning is resolved.
 
> diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
> index a7514f7..f6d9c79 100644
> --- a/desktop-shell/shell.c
> +++ b/desktop-shell/shell.c
> @@ -5374,8 +5374,13 @@ set_maximized_position(struct desktop_shell *shell,
>  	pixman_box32_t *e;
>  
>  	get_output_work_area(shell, shsurf->output, &area);
> -	surface_subsurfaces_boundingbox(shsurf->surface,
> -					&surf_x, &surf_y, NULL, NULL);
> +	if (shsurf->has_set_geometry) {
> +		surf_x = shsurf->geometry.x;
> +		surf_y = shsurf->geometry.y;
> +	} else {
> +		surface_subsurfaces_boundingbox(shsurf->surface,
> +						&surf_x, &surf_y, NULL, NULL);
> +	}
>  	e = pixman_region32_extents(&shsurf->output->region);
>  
>  	weston_view_set_position(shsurf->view,
> -- 
> 2.2.1
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel