mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-25 09:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

use node_is_view

Browse source
This commit is contained in:
siikamiika 2021-10-09 16:40:24 +03:00 committed by Simon Ser
parent 624ffa4516
commit f4db502d44
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/input/cursor.c
View file

@ -1346,7 +1346,7 @@ void handle_pointer_constraint(struct wl_listener *listener, void *data) {
wl_signal_add(&constraint->events.destroy, &sway_constraint->destroy); wl_signal_add(&constraint->events.destroy, &sway_constraint->destroy);
struct sway_node *focus = seat_get_focus(seat); 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; struct wlr_surface *surface = focus->sway_container->view->surface;
if (surface == constraint->surface) { if (surface == constraint->surface) {
sway_cursor_constrain(seat->cursor, constraint); sway_cursor_constrain(seat->cursor, constraint);

5
sway/input/seat.c
View file

@ -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_container *seat_get_focus_inactive_view(struct sway_seat *seat,
struct sway_node *ancestor) { struct sway_node *ancestor) {
if (ancestor->type == N_CONTAINER && ancestor->sway_container->view) { if (node_is_view(ancestor)) {
return ancestor->sway_container; return ancestor->sway_container;
} }
struct sway_seat_node *current; struct sway_seat_node *current;
wl_list_for_each(current, &seat->focus_stack, link) { wl_list_for_each(current, &seat->focus_stack, link) {
struct sway_node *node = current->node; struct sway_node *node = current->node;
if (node->type == N_CONTAINER && node->sway_container->view && if (node_is_view(node) && node_has_ancestor(node, ancestor)) {
node_has_ancestor(node, ancestor)) {
return node->sway_container; return node->sway_container;
} }
} }