[PATCH weston] shell: fix maximizing windows on a secondary output

[Derek Foreman]

On 09/10/15 11:17 AM, Marek Chalupa wrote:
> commit f814c5dc9 changed get_output_work_area behaviour
> which broke the code for positioning maximized window.
> The x position was set to 2*output->x instead of to output->x
> 
> fix https://bugs.freedesktop.org/show_bug.cgi?id=92357
> 
> Signed-off-by: Marek Chalupa <mchqwerty at gmail.com>

My bug.

Thanks.

Reviewed-by: Derek Foreman <derekf at osg.samsung.com>

> ---
>  desktop-shell/shell.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
> index a355b48..3eb3f5c 100644
> --- a/desktop-shell/shell.c
> +++ b/desktop-shell/shell.c
> @@ -5573,7 +5573,6 @@ set_maximized_position(struct desktop_shell *shell,
>  {
>  	int32_t surf_x, surf_y;
>  	pixman_rectangle32_t area;
> -	pixman_box32_t *e;
>  
>  	get_output_work_area(shell, shsurf->output, &area);
>  	if (shsurf->has_set_geometry) {
> @@ -5583,11 +5582,10 @@ set_maximized_position(struct desktop_shell *shell,
>  		surface_subsurfaces_boundingbox(shsurf->surface,
>  						&surf_x, &surf_y, NULL, NULL);
>  	}
> -	e = pixman_region32_extents(&shsurf->output->region);
>  
>  	weston_view_set_position(shsurf->view,
> -				 e->x1 + area.x - surf_x,
> -				 e->y1 + area.y - surf_y);
> +				 area.x - surf_x,
> +				 area.y - surf_y);
>  }
>  
>  static void
>