Merge pull request #1994 from RyanDwyer/fix-focus-stealing

Don't steal focus when a view changes its title
This commit is contained in:
emersion 2018-05-16 11:39:43 +01:00 committed by GitHub
commit 6a13f3eb38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -365,8 +365,7 @@ void view_execute_criteria(struct sway_view *view) {
return;
}
struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *prior_workspace =
container_parent(view->swayc, C_WORKSPACE);
struct sway_container *prior_focus = seat_get_focus(seat);
list_t *criterias = criteria_for_view(view, CT_COMMAND);
for (int i = 0; i < criterias->length; i++) {
struct criteria *criteria = criterias->items[i];
@ -388,7 +387,7 @@ void view_execute_criteria(struct sway_view *view) {
seat_set_focus(seat, view->swayc);
}
list_free(criterias);
seat_set_focus(seat, seat_get_focus_inactive(seat, prior_workspace));
seat_set_focus(seat, prior_focus);
}
void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {