diff options
| author | mwenzkowski <29407878+mwenzkowski@users.noreply.github.com> | 2018-12-12 11:54:09 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-12-12 13:41:47 +0100 |
| commit | 01420193efb322509c5191622b1bbd4f0d36280f (patch) | |
| tree | bf60c03edd14bf7110d08643cee3c5d947738e48 | |
| parent | 549d9fe489a6a75ef486c67658b34649f4316873 (diff) | |
| download | sway-01420193efb322509c5191622b1bbd4f0d36280f.tar.xz | |
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
| -rw-r--r-- | sway/tree/view.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c index 4c46d0e9..e890f4f3 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); } |