summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Tony Crisci <tony@dubstepdish.com>2018-03-29 18:17:31 -0400
committerLibravatar Tony Crisci <tony@dubstepdish.com>2018-03-29 18:17:31 -0400
commit62d1b4cb96f87274d695a9c11a041c42cf59ddc1 (patch)
treef58d674fc314e9e0bd2a8141582d82b160b41b25
parentrename container destroy func (diff)
downloadsway-62d1b4cb96f87274d695a9c11a041c42cf59ddc1.tar.gz
sway-62d1b4cb96f87274d695a9c11a041c42cf59ddc1.tar.zst
sway-62d1b4cb96f87274d695a9c11a041c42cf59ddc1.zip
fix container_get_in_direction name
-rw-r--r--include/sway/tree/container.h7
-rw-r--r--sway/commands/focus.c2
-rw-r--r--sway/tree/layout.c2
3 files changed, 5 insertions, 6 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 572dd8e3..3548afc1 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -97,13 +97,12 @@ struct sway_container *container_workspace_create(
97struct sway_container *container_view_create( 97struct sway_container *container_view_create(
98 struct sway_container *sibling, struct sway_view *sway_view); 98 struct sway_container *sibling, struct sway_view *sway_view);
99 99
100struct sway_container *container_output_destroy( 100struct sway_container *container_output_destroy(struct sway_container *output);
101 struct sway_container *output);
102 101
103struct sway_container *container_view_destroy(struct sway_container *view); 102struct sway_container *container_view_destroy(struct sway_container *view);
104 103
105struct sway_container *container_set_layout( 104struct sway_container *container_set_layout(struct sway_container *container,
106 struct sway_container *container, enum sway_container_layout layout); 105 enum sway_container_layout layout);
107 106
108void container_descendents(struct sway_container *root, 107void container_descendents(struct sway_container *root,
109 enum sway_container_type type, 108 enum sway_container_type type,
diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index 64b05904..64f079f4 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -51,7 +51,7 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
51 "Expected 'focus <direction|parent|child|mode_toggle>' or 'focus output <direction|name>'"); 51 "Expected 'focus <direction|parent|child|mode_toggle>' or 'focus output <direction|name>'");
52 } 52 }
53 53
54 struct sway_container *next_focus = get_swayc_in_direction(con, seat, direction); 54 struct sway_container *next_focus = container_get_in_direction(con, seat, direction);
55 if (next_focus) { 55 if (next_focus) {
56 sway_seat_set_focus(seat, next_focus); 56 sway_seat_set_focus(seat, next_focus);
57 } 57 }
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 5152e523..fb34573f 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -587,7 +587,7 @@ static struct sway_container *get_swayc_in_direction_under(struct sway_container
587 } 587 }
588} 588}
589 589
590struct sway_container *get_swayc_in_direction(struct sway_container *container, struct sway_seat *seat, 590struct sway_container *container_get_in_direction(struct sway_container *container, struct sway_seat *seat,
591 enum movement_direction dir) { 591 enum movement_direction dir) {
592 return get_swayc_in_direction_under(container, dir, seat, NULL); 592 return get_swayc_in_direction_under(container, dir, seat, NULL);
593} 593}