X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=90131c270734311cc67bf1b214a51d179ba58cbd;hb=d95b25c6a9dfa6ef7b8d6dfa05c8a2594c045e52;hp=d1666265c78b112606ad9f9f84821eef305bbcda;hpb=831d1b21b5e786d2e5e804ca5a6a2a2b1dfacd1e;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index d166626..90131c2 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -112,19 +112,18 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
 	struct weston_surface *wsurface =
 		weston_desktop_surface_get_surface(dsurface);
 
-	struct ivi_output *output;
-
-	if (surface->role == IVI_SURFACE_ROLE_DESKTOP)
-		output = surface->desktop.last_output;
-	else if (surface->role == IVI_SURFACE_ROLE_POPUP)
-		output = surface->popup.output;
-	else if (surface->role == IVI_SURFACE_ROLE_SPLIT_H ||
-		 surface->role == IVI_SURFACE_ROLE_SPLIT_V)
-		output = surface->split.output;
-	else if (surface->role == IVI_SURFACE_ROLE_FULLSCREEN)
-		output = surface->fullscreen.output;
-	else
-		return;
+	struct ivi_output *output = ivi_layout_get_output_from_surface(surface);
+	assert(output != NULL);
+
+	/* resize the active surface to the original size */
+	if (surface->role == IVI_SURFACE_ROLE_SPLIT_H ||
+	    surface->role == IVI_SURFACE_ROLE_SPLIT_V) {
+		if (output && output->active) {
+			ivi_layout_desktop_resize(output->active, output->area_saved);
+		}
+		/* restore the area back so we can re-use it again if needed */
+		output->area = output->area_saved;
+	}
 
 	/* reset the active surface as well */
 	if (output && output->active && output->active == surface) {