mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-27 02:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2036 from RyanDwyer/workspace-switch-on-map

Browse source 
Switch workspace if required when mapping a view
This commit is contained in:
Drew DeVault 2018-05-25 08:47:08 -04:00 committed by GitHub
parent daf328d054 f32a002401
commit ab74c95d56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sway/tree/view.c
View file

@ -439,10 +439,11 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
// Check if there's any `assign` criteria for the view // Check if there's any `assign` criteria for the view
list_t *criterias = criteria_for_view(view, list_t *criterias = criteria_for_view(view,
CT_ASSIGN_WORKSPACE | CT_ASSIGN_OUTPUT); CT_ASSIGN_WORKSPACE | CT_ASSIGN_OUTPUT);
struct sway_container *workspace = NULL;
if (criterias->length) { if (criterias->length) {
struct criteria *criteria = criterias->items[0]; struct criteria *criteria = criterias->items[0];
if (criteria->type == CT_ASSIGN_WORKSPACE) { if (criteria->type == CT_ASSIGN_WORKSPACE) {
struct sway_container *workspace = workspace_by_name(criteria->target); workspace = workspace_by_name(criteria->target);
if (!workspace) { if (!workspace) {
workspace = workspace_create(NULL, criteria->target); workspace = workspace_create(NULL, criteria->target);
} }
@ -469,6 +470,9 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
arrange_children_of(cont->parent); arrange_children_of(cont->parent);
input_manager_set_focus(input_manager, cont); input_manager_set_focus(input_manager, cont);
if (workspace) {
workspace_switch(workspace);
}
view_update_title(view, false); view_update_title(view, false);
container_notify_subtree_changed(view->swayc->parent); container_notify_subtree_changed(view->swayc->parent);