mirror of
https://github.com/swaywm/sway.git
synced 2024-11-14 22:43:58 +01:00
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
This commit is contained in:
parent
549d9fe489
commit
01420193ef
@ -605,7 +605,6 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
|
|||||||
|
|
||||||
view_update_title(view, false);
|
view_update_title(view, false);
|
||||||
container_update_representation(view->container);
|
container_update_representation(view->container);
|
||||||
view_execute_criteria(view);
|
|
||||||
|
|
||||||
if (decoration) {
|
if (decoration) {
|
||||||
view_update_csd_from_client(view, 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)) {
|
if (should_focus(view)) {
|
||||||
input_manager_set_focus(&view->container->node);
|
input_manager_set_focus(&view->container->node);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user