mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-09-22 13:42:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix focus child

Browse Source
This commit is contained in:
Tony Crisci 2018-04-04 22:31:10 -04:00
parent cfd806577b
commit deda37469a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sway/input/seat.c
View File

@ -123,7 +123,7 @@ static void handle_seat_container_destroy(struct wl_listener *listener,
static struct sway_seat_container *seat_container_from_container( static struct sway_seat_container *seat_container_from_container(
struct sway_seat *seat, struct sway_container *con) { struct sway_seat *seat, struct sway_container *con) {
if (con->type < C_WORKSPACE) { if (con->type == C_ROOT || con->type == C_OUTPUT) {
// these don't get seat containers ever // these don't get seat containers ever
return NULL; return NULL;
} }
@ -473,7 +473,7 @@ struct sway_container *seat_get_focus_by_type(struct sway_seat *seat,
struct sway_seat_container *current = NULL; struct sway_seat_container *current = NULL;
wl_list_for_each(current, &seat->focus_stack, link) { wl_list_for_each(current, &seat->focus_stack, link) {
if (type != C_TYPES && container->type != type) { if (current->container->type != type && type != C_TYPES) {
continue; continue;
} }

10
sway/tree/layout.c
View File

@ -638,16 +638,16 @@ struct sway_container *container_get_in_direction(
wrap_candidate = parent->children->items[0]; wrap_candidate = parent->children->items[0];
} }
if (config->force_focus_wrapping) { if (config->force_focus_wrapping) {
return seat_get_focus_by_type(seat, return wrap_candidate;
wrap_candidate, C_VIEW);
} }
} }
} else { } else {
struct sway_container *desired_con = parent->children->items[desired];
wlr_log(L_DEBUG, wlr_log(L_DEBUG,
"cont %d-%p dir %i sibling %d: %p", idx, "cont %d-%p dir %i sibling %d: %p", idx,
container, dir, desired, parent->children->items[desired]); container, dir, desired, desired_con);
return seat_get_focus_by_type(seat, struct sway_container *next = seat_get_focus_by_type(seat, desired_con, C_VIEW);
parent->children->items[desired], C_VIEW); return next;
} }
} }