X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=211c7e2f2402da757b6c536c78d9563c46dd462e;hb=52769b82974afda0b4bba8b0c98a996cb96cac06;hp=03a21865af21984f9c3b282d05b191d8a66508f0;hpb=5ce0b5d5200f8d5e21e15981b0179fd429ee836d;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index 03a2186..211c7e2 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -92,10 +92,7 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
 	weston_desktop_surface_set_user_data(dsurface, surface);
 
 	if (ivi->shell_client.ready) {
-		if (ivi_check_pending_desktop_surface_popup(surface))
-			ivi_set_desktop_surface_popup(surface);
-		else
-			ivi_set_desktop_surface(surface);
+		ivi_check_pending_desktop_surface(surface);
 	} else {
 		/*
 		 * We delay creating "normal" desktop surfaces until later, to
@@ -120,9 +117,24 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
 		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_FS)
+		output = surface->fs.output;
 	else
 		return;
 
+	/* 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) {
 		output->active->view->is_mapped = false;
@@ -164,6 +176,13 @@ desktop_committed(struct weston_desktop_surface *dsurface,
 	case IVI_SURFACE_ROLE_POPUP:
 		ivi_layout_popup_committed(surface);
 		break;
+	case IVI_SURFACE_ROLE_FS:
+		ivi_layout_fs_committed(surface);
+		break;
+	case IVI_SURFACE_ROLE_SPLIT_H:
+	case IVI_SURFACE_ROLE_SPLIT_V:
+		ivi_layout_split_committed(surface);
+		break;
 	case IVI_SURFACE_ROLE_NONE:
 	case IVI_SURFACE_ROLE_BACKGROUND:
 	default: /* fall through */