summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Vlad <marius.vlad@collabora.com>2023-06-13 13:47:19 +0300
committerMarius Vlad <marius.vlad@collabora.com>2023-06-13 13:48:03 +0300
commite9d9ca27950e270bc89a33e7543bd390c5ecc149 (patch)
tree1845a1463384a4067c0d4de92d7279f53f25371c
parent2f6794dbd5854ae5bad092d6b4332fe9fa76418e (diff)
shell: Don't reset the activation area alwaysoctopus
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
-rw-r--r--src/shell.c6
1 files changed, 4 insertions, 2 deletions
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);
}