diff options
| author |   Marius Vlad <marius.vlad@collabora.com> | 2020-04-03 15:20:00 +0300 |
|---|---|---|
| committer | Marius Vlad <marius.vlad@collabora.com> | 2020-05-12 18:30:23 +0000 |
| commit | 5ce0b5d5200f8d5e21e15981b0179fd429ee836d (patch) | |
| tree | 97c485426498e7d9f918c11335fb87df180b8993 /src/desktop.c | |
| parent | ab151e5d3d10f85901c0a9b689ef62e83c7dbc5e (diff) | |
layout, desktop: Implement the pop-up role
Temporally store the application details in a list of pending
applications as to be used when creating the desktop surface. Store the
output alongside the x and y values, useful in setting up the initial
positional values of the window.
Bug-AGL: SPEC-3269
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: Icae57378ff405a8770c074a3e2fe1e04535302ef
Diffstat (limited to 'src/desktop.c')
| -rw-r--r-- | src/desktop.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/desktop.c b/src/desktop.c index 3e36415..03a2186 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -92,7 +92,10 @@ 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); + if (ivi_check_pending_desktop_surface_popup(surface)) + ivi_set_desktop_surface_popup(surface); + else + ivi_set_desktop_surface(surface); } else { /* * We delay creating "normal" desktop surfaces until later, to @@ -111,10 +114,13 @@ 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; + struct ivi_output *output; - /* TODO */ - if (surface->role != IVI_SURFACE_ROLE_DESKTOP) + 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; /* reset the active surface as well */ @@ -155,6 +161,9 @@ 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_NONE: case IVI_SURFACE_ROLE_BACKGROUND: default: /* fall through */ |