layout, desktop: Treat the remote surface role like the desktop one

[src/agl-compositor.git] / src / desktop.c

diff --git a/src/desktop.c b/src/desktop.c
index 2ef6fee..b9e45da 100644 (file)
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -112,14 +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
-               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) {
@@ -177,6 +181,7 @@ desktop_committed(struct weston_desktop_surface *dsurface,
 
        switch (surface->role) {
        case IVI_SURFACE_ROLE_DESKTOP:
+       case IVI_SURFACE_ROLE_REMOTE:
                ivi_layout_desktop_committed(surface);
                break;
        case IVI_SURFACE_ROLE_PANEL:
@@ -185,6 +190,13 @@ desktop_committed(struct weston_desktop_surface *dsurface,
        case IVI_SURFACE_ROLE_POPUP:
                ivi_layout_popup_committed(surface);
                break;
+       case IVI_SURFACE_ROLE_FULLSCREEN:
+               ivi_layout_fullscreen_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 */