summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Vlad <marius.vlad@collabora.com>2020-06-01 21:46:32 +0300
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-06-15 10:08:58 +0000
commitc6941d7484dd2b6c50ad37e2763f363b7264d4e5 (patch)
tree35811c517356b42de5e95893f744ab37937a942c
parent9d29ef9fdb4a236affaec23f050baad0cfca3659 (diff)
desktop: Display a black surface for apps being moved using config file
Just like the 'remote' surface roles, put back a black surface if there's no background set and if it is the last surface on that output. Bug-AGL: SPEC-3280 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: I7bd7ae55fc668753223a23462b697071faa16525
-rw-r--r--src/desktop.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/desktop.c b/src/desktop.c
index a3552e2..f8c614f 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -112,13 +112,13 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
}
static bool
-desktop_surface_check_last_remote_surfaces(struct ivi_compositor *ivi)
+desktop_surface_check_last_remote_surfaces(struct ivi_compositor *ivi, enum ivi_surface_role role)
{
int count = 0;
struct ivi_surface *surf;
wl_list_for_each(surf, &ivi->surfaces, link)
- if (surf->role == IVI_SURFACE_ROLE_REMOTE)
+ if (surf->role == role)
count++;
return (count == 1);
@@ -157,7 +157,13 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
/* check if there's a last 'remote' surface and insert a black
* surface view if there's no background set for that output
*/
- if (desktop_surface_check_last_remote_surfaces(output->ivi))
+ if (desktop_surface_check_last_remote_surfaces(output->ivi,
+ IVI_SURFACE_ROLE_REMOTE))
+ if (!output->background)
+ insert_black_surface(output);
+
+ if (desktop_surface_check_last_remote_surfaces(output->ivi,
+ IVI_SURFACE_ROLE_DESKTOP))
if (!output->background)
insert_black_surface(output);