From: Marius Vlad <marius.vlad@collabora.com>
Date: Tue, 13 Jun 2023 10:47:19 +0000 (+0300)
Subject: shell: Don't reset the activation area always
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Foctopus;p=src%2Fagl-compositor.git

shell: Don't reset the activation area always

Rather than doing that always, be more selective, and perform it if we
had already an application active.

Bug-AGL: SPEC-4829
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I707f92d1cc1f820af493bae9daa5a948aa452ad8
---

diff --git a/src/shell.c b/src/shell.c
index bcfb673..68227c3 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1622,18 +1622,20 @@ unbind_agl_shell(struct wl_resource *resource)
 	}
 
 	wl_list_for_each(output, &ivi->outputs, link) {
-		struct weston_geometry area = {};
 
 		/* reset the active surf if there's one present */
 		if (output->active) {
+			struct weston_geometry area = {};
+
 			output->active->view->is_mapped = false;
 			output->active->view->surface->is_mapped = false;
 
 			weston_layer_entry_remove(&output->active->view->layer_link);
 			output->active = NULL;
+
+			output->area_activation = area;
 		}
 
-		output->area_activation = area;
 		insert_black_curtain(output);
 	}