alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

address feedback

Browse source
This commit is contained in:
Tony Crisci 2018-04-02 14:15:40 -04:00
parent 2187684bd0
commit 357a4401fa
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sway/commands/split.c
View file

@ -76,6 +76,7 @@ struct cmd_results *cmd_split(int argc, char **argv) {
strcasecmp(argv[0], "toggle") == 0) { strcasecmp(argv[0], "toggle") == 0) {
struct sway_container *focused = struct sway_container *focused =
config->handler_context.current_container; config->handler_context.current_container;
if (focused->parent->layout == L_VERT) { if (focused->parent->layout == L_VERT) {
_do_split(argc - 1, argv + 1, L_HORIZ); _do_split(argc - 1, argv + 1, L_HORIZ);
} else { } else {

1
sway/input/seat.c
View file

@ -92,7 +92,6 @@ static void handle_seat_container_destroy(struct wl_listener *listener,
struct sway_container *parent = con->parent; struct sway_container *parent = con->parent;
struct sway_container *focus = sway_seat_get_focus(seat); struct sway_container *focus = sway_seat_get_focus(seat);
// TODO handle workspace switch in the seat?
bool set_focus = bool set_focus =
focus != NULL && focus != NULL &&
(focus == con || container_has_child(con, focus)) && (focus == con || container_has_child(con, focus)) &&

2
sway/tree/container.c
View file

@ -424,7 +424,7 @@ bool container_has_anscestor(struct sway_container *descendant,
return false; return false;
} }
bool find_child_func(struct sway_container *con, void *data) { static bool find_child_func(struct sway_container *con, void *data) {
struct sway_container *child = data; struct sway_container *child = data;
return con == child; return con == child;
} }

5
sway/tree/layout.c
View file

@ -101,8 +101,6 @@ void container_add_child(struct sway_container *parent,
parent, parent->type, parent->width, parent->height); parent, parent->type, parent->width, parent->height);
list_add(parent->children, child); list_add(parent->children, child);
child->parent = parent; child->parent = parent;
// TODO: set focus for this container?
sway_input_manager_set_focus(input_manager, child);
} }
struct sway_container *container_reap_empty(struct sway_container *container) { struct sway_container *container_reap_empty(struct sway_container *container) {
@ -632,7 +630,8 @@ 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 sway_seat_get_focus_by_type(seat, wrap_candidate, C_VIEW); return sway_seat_get_focus_by_type(seat,
wrap_candidate, C_VIEW);
} }
} }
} else { } else {