shell: fix positioning of maximized surfaces with a custom geometry

This commit is contained in:
Giulio Camuffo 2015-01-09 20:10:45 +02:00 committed by Bryce Harrington
parent 237a684e40
commit 7a8d67dedf

View file

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