diff options
| -rw-r--r-- | sway/input/cursor.c | 2 | ||||
| -rw-r--r-- | sway/input/seat.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 2fe5b202..1e3e16d6 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -1346,7 +1346,7 @@ void handle_pointer_constraint(struct wl_listener *listener, void *data) { wl_signal_add(&constraint->events.destroy, &sway_constraint->destroy); struct sway_node *focus = seat_get_focus(seat); - if (focus && focus->type == N_CONTAINER && focus->sway_container->view) { + if (focus && node_is_view(focus)) { struct wlr_surface *surface = focus->sway_container->view->surface; if (surface == constraint->surface) { sway_cursor_constrain(seat->cursor, constraint); diff --git a/sway/input/seat.c b/sway/input/seat.c index 2d714acd..c5c8459e 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -210,14 +210,13 @@ void seat_for_each_node(struct sway_seat *seat, struct sway_container *seat_get_focus_inactive_view(struct sway_seat *seat, struct sway_node *ancestor) { - if (ancestor->type == N_CONTAINER && ancestor->sway_container->view) { + if (node_is_view(ancestor)) { return ancestor->sway_container; } struct sway_seat_node *current; wl_list_for_each(current, &seat->focus_stack, link) { struct sway_node *node = current->node; - if (node->type == N_CONTAINER && node->sway_container->view && - node_has_ancestor(node, ancestor)) { + if (node_is_view(node) && node_has_ancestor(node, ancestor)) { return node->sway_container; } } |