alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix criteria execution in view_map

Browse source 
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
This commit is contained in:
mwenzkowski 2018-12-12 11:54:09 +01:00 committed by emersion
parent 549d9fe489
commit 01420193ef
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sway/tree/view.c
View file

@ -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);
}