aboutsummaryrefslogtreecommitdiffstats
path: root/sway/tree/view.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-09-16 22:01:54 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-09-16 22:01:54 +1000
commitf6e218a64371b02afdf6b7812a52d70b13635ef3 (patch)
tree7348bf536a2bfbdedabe28d00a3c49b1bfcb559a /sway/tree/view.c
parentMake seat_get_active_child ignore floating children (diff)
downloadsway-f6e218a64371b02afdf6b7812a52d70b13635ef3.tar.gz
sway-f6e218a64371b02afdf6b7812a52d70b13635ef3.tar.zst
sway-f6e218a64371b02afdf6b7812a52d70b13635ef3.zip
Rename seat_get_active_child to seat_get_active_tiling_child
Also renames container to con in one function to prevent ugly line wrapping.
Diffstat (limited to 'sway/tree/view.c')
-rw-r--r--sway/tree/view.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 78f85de2..e4e1c161 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -1001,17 +1001,17 @@ bool view_is_visible(struct sway_view *view) {
1001 bool is_sticky = container_is_floating(floater) && floater->is_sticky; 1001 bool is_sticky = container_is_floating(floater) && floater->is_sticky;
1002 // Check view isn't in a tabbed or stacked container on an inactive tab 1002 // Check view isn't in a tabbed or stacked container on an inactive tab
1003 struct sway_seat *seat = input_manager_current_seat(input_manager); 1003 struct sway_seat *seat = input_manager_current_seat(input_manager);
1004 struct sway_container *container = view->container; 1004 struct sway_container *con = view->container;
1005 while (container) { 1005 while (con) {
1006 enum sway_container_layout layout = container_parent_layout(container); 1006 enum sway_container_layout layout = container_parent_layout(con);
1007 if (layout == L_TABBED || layout == L_STACKED) { 1007 if (layout == L_TABBED || layout == L_STACKED) {
1008 struct sway_node *parent = container->parent ? 1008 struct sway_node *parent = con->parent ?
1009 &container->parent->node : &container->workspace->node; 1009 &con->parent->node : &con->workspace->node;
1010 if (seat_get_active_child(seat, parent) != &container->node) { 1010 if (seat_get_active_tiling_child(seat, parent) != &con->node) {
1011 return false; 1011 return false;
1012 } 1012 }
1013 } 1013 }
1014 container = container->parent; 1014 con = con->parent;
1015 } 1015 }
1016 // Check view isn't hidden by another fullscreen view 1016 // Check view isn't hidden by another fullscreen view
1017 if (workspace->fullscreen && 1017 if (workspace->fullscreen &&