X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;fp=src%2Flayout.c;h=ff1713b91810bba08b6294f2d432250e3eb47afb;hb=e4f4aef1a5b1feb95c40b3c453f448c5bcf9c054;hp=4ffcb167f837cf2bde46c2ce1336f43b6624144e;hpb=52df92d73985dba862a157c5ca3003cbe465e295;p=src%2Fagl-compositor.git

diff --git a/src/layout.c b/src/layout.c
index 4ffcb16..ff1713b 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -555,6 +555,15 @@ ivi_layout_split_committed(struct ivi_surface *surface)
 			app_id, ivi_layout_get_surface_role_name(surface), output->name);
 }
 
+static void
+ivi_compute_popup_position(const struct weston_output *output, struct weston_view *view,
+			   int initial_x, int initial_y, int *new_x, int *new_y)
+{
+	*new_x = output->x + initial_x;
+	*new_y = output->y + initial_y;
+}
+
+
 void
 ivi_layout_popup_committed(struct ivi_surface *surface)
 {
@@ -566,6 +575,8 @@ ivi_layout_popup_committed(struct ivi_surface *surface)
 		weston_desktop_surface_get_surface(dsurface);
 	const char *app_id = weston_desktop_surface_get_app_id(dsurface);
 
+	int new_x, new_y;
+
 	struct ivi_output *output = surface->popup.output;
 	struct weston_output *woutput = output->output;
 
@@ -582,7 +593,10 @@ ivi_layout_popup_committed(struct ivi_surface *surface)
 	assert(surface->role == IVI_SURFACE_ROLE_POPUP);
 
 	weston_view_set_output(view, woutput);
-	weston_view_set_position(view, surface->popup.x, surface->popup.y);
+
+	ivi_compute_popup_position(woutput, view,
+				   surface->popup.x, surface->popup.y, &new_x, &new_y);
+	weston_view_set_position(view, new_x, new_y);
 
 	/* only clip the pop-up dialog window if we have a valid
 	 * width and height being passed on. Users might not want to have one