aboutsummaryrefslogtreecommitdiffstats
path: root/sway/tree/container.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-09-22 10:42:59 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-09-22 10:42:59 +1000
commitbf5933c501a3c1705715b62dc1507df2bf0a4d2b (patch)
treeb95e6a1f8f3352c3fe93cf405108f6f6652f3947 /sway/tree/container.c
parentMerge pull request #2666 from emersion/swaybar-hotplug (diff)
downloadsway-bf5933c501a3c1705715b62dc1507df2bf0a4d2b.tar.gz
sway-bf5933c501a3c1705715b62dc1507df2bf0a4d2b.tar.zst
sway-bf5933c501a3c1705715b62dc1507df2bf0a4d2b.zip
Implement tab cycling using mouse wheel
Firstly, a change had to be made to the container_at functions. If you create layout `T[view H[view view]]` and hover the second tab, the container_at functions would return the focus_inactive child. They now return the split container itself. To compensate for this, dispatch_cursor_button has been adjusted to find the focus_inactive child before focusing it. The actual implementation of wheel scrolling is pretty straightforward. This uses handle_cursor_axis, so I took a similar approach to handle_cursor_button (ie. creating a dispatch_cursor_axis function).
Diffstat (limited to 'sway/tree/container.c')
-rw-r--r--sway/tree/container.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 47687744..b8af7564 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -215,8 +215,7 @@ static struct sway_container *container_at_tabbed(struct sway_node *parent,
215 child_index = children->length - 1; 215 child_index = children->length - 1;
216 } 216 }
217 struct sway_container *child = children->items[child_index]; 217 struct sway_container *child = children->items[child_index];
218 struct sway_node *node = seat_get_focus_inactive(seat, &child->node); 218 return child;
219 return node->sway_container;
220 } 219 }
221 220
222 // Surfaces 221 // Surfaces
@@ -243,8 +242,7 @@ static struct sway_container *container_at_stacked(struct sway_node *parent,
243 int child_index = (ly - box.y) / title_height; 242 int child_index = (ly - box.y) / title_height;
244 if (child_index < children->length) { 243 if (child_index < children->length) {
245 struct sway_container *child = children->items[child_index]; 244 struct sway_container *child = children->items[child_index];
246 struct sway_node *node = seat_get_focus_inactive(seat, &child->node); 245 return child;
247 return node->sway_container;
248 } 246 }
249 247
250 // Surfaces 248 // Surfaces