commit 7a8d67dedfcfc6b55421b0f5906ba9913ff61ee8
author Giulio Camuffo <giuliocamuffo@gmail.com> Fri Jan 09 20:10:45 2015 +0200
committer Bryce Harrington <bryce@osg.samsung.com> Tue Jan 27 15:27:39 2015 -0800
tree 39f220b7ca4da8efd0fc25834d6dd46ba6412d3d
parent 237a684e404703356632688191d718863a683126

shell: fix positioning of maximized surfaces with a custom geometry

desktop-shell/shell.c

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