layout: Resize the active surface when doing the split

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

diff --git a/src/desktop.c b/src/desktop.c
index da28fc6..211c7e2 100644 (file)
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -80,6 +80,7 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
        surface->ivi = ivi;
        surface->dsurface = dsurface;
        surface->role = IVI_SURFACE_ROLE_NONE;
+       surface->activated_by_default = false;
 
        if (ivi->policy && ivi->policy->api.surface_create &&
            !ivi->policy->api.surface_create(surface, ivi)) {
@@ -91,7 +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) {
-               ivi_set_desktop_surface(surface);
+               ivi_check_pending_desktop_surface(surface);
        } else {
                /*
                 * We delay creating "normal" desktop surfaces until later, to
@@ -110,12 +111,30 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
        struct weston_surface *wsurface =
                weston_desktop_surface_get_surface(dsurface);
 
-       struct ivi_output *output = surface->desktop.last_output;
-
-       /* TODO */
-       if (surface->role != IVI_SURFACE_ROLE_DESKTOP)
+       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_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;
@@ -154,6 +173,16 @@ desktop_committed(struct weston_desktop_surface *dsurface,
        case IVI_SURFACE_ROLE_PANEL:
                ivi_layout_panel_committed(surface);
                break;
+       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 */