From af2b5c21935faa5fefb93d6460a04379c6fd6521 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Sat, 16 May 2020 16:18:50 +0300 Subject: shell: Determine the role type Now that we have the ability to determine the role type between pop-up diaglos, full-screen, or split ones use the wrappers installed previously to make use of them. Keep the same functionality by activating the desktop surface if we determine we have one. Bug-AGL: SPEC-3334 Signed-off-by: Marius Vlad Change-Id: Ibce3bc040ce3683ab41709d68d5fbf90d90ea539 --- src/shell.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/shell.c b/src/shell.c index c132ae5..df8ea84 100644 --- a/src/shell.c +++ b/src/shell.c @@ -276,8 +276,10 @@ ivi_check_pending_desktop_surface(struct ivi_surface *surface) return; } - /* if we end up here means we have a regular desktop app */ + /* if we end up here means we have a regular desktop app and + * try to activate it */ ivi_set_desktop_surface(surface); + ivi_layout_desktop_committed(surface); } void @@ -525,13 +527,7 @@ shell_ready(struct wl_client *client, struct wl_resource *shell_res) wl_list_for_each_safe(surface, tmp, &ivi->pending_surfaces, link) { wl_list_remove(&surface->link); - - if (ivi_check_pending_desktop_surface_popup(surface)) { - ivi_set_desktop_surface_popup(surface); - } else { - ivi_set_desktop_surface(surface); - ivi_layout_desktop_committed(surface); - } + ivi_check_pending_desktop_surface(surface); } } -- cgit 1.2.3-korg