From 01420193efb322509c5191622b1bbd4f0d36280f Mon Sep 17 00:00:00 2001
From: mwenzkowski <29407878+mwenzkowski@users.noreply.github.com>
Date: Wed, 12 Dec 2018 11:54:09 +0100
Subject: [PATCH] Fix criteria execution in view_map

This patch moves view_execute_criteria(view) below the fullscreen code.
Previously, if a view requested to be started in fullscreen, this was
done after execution of criteria and hence it was impossible to disable
fullscreen via criteria.

Fixes #3285
---
 sway/tree/view.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sway/tree/view.c b/sway/tree/view.c
index 4c46d0e97..e890f4f33 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -605,7 +605,6 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
 
 	view_update_title(view, false);
 	container_update_representation(view->container);
-	view_execute_criteria(view);
 
 	if (decoration) {
 		view_update_csd_from_client(view, decoration);
@@ -622,6 +621,8 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
 		}
 	}
 
+	view_execute_criteria(view);
+
 	if (should_focus(view)) {
 		input_manager_set_focus(&view->container->node);
 	}