shell: fix positioning of maximized surfaces with a custom geometry

10 years ago · 7a8d67dedf
parent 237a684e40
commit 7a8d67dedf
1 changed files with 7 additions and 2 deletions
--- 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,