sway

commit ab74c95d56b856bfd2e9e8fd4bd49280f671960f
parent daf328d0540b3e4919ae726922b68b8edc0fc2a3
Author: Drew DeVault <sir@cmpwn.com>
Date:   Fri, 25 May 2018 08:47:08 -0400

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

Switch workspace if required when mapping a view
Diffstat:
M
sway/tree/view.c
 | 
6
+++++-

1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sway/tree/view.c b/sway/tree/view.c
@@ -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
 	list_t *criterias = criteria_for_view(view,
 			CT_ASSIGN_WORKSPACE | CT_ASSIGN_OUTPUT);
+	struct sway_container *workspace = NULL;
 	if (criterias->length) {
 		struct criteria *criteria = criterias->items[0];
 		if (criteria->type == CT_ASSIGN_WORKSPACE) {
-			struct sway_container *workspace = workspace_by_name(criteria->target);
+			workspace = workspace_by_name(criteria->target);
 			if (!workspace) {
 				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);
 	input_manager_set_focus(input_manager, cont);
+	if (workspace) {
+		workspace_switch(workspace);
+	}
 
 	view_update_title(view, false);
 	container_notify_subtree_changed(view->swayc->parent);