diff options
| author |  emersion <contact@emersion.fr> | 2018-07-02 13:29:25 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-02 13:29:25 +0100 |
| commit | 8cc26130a66f533a5cbb8e4833a536dd8798f833 (patch) | |
| tree | e6556155ef90d573f4ae854aaf83a6e57091bf2e | |
| parent | Merge pull request #2193 from RyanDwyer/fix-fullscreen-damage (diff) | |
| parent | Don't return pending children in seat_get_active_current_child (diff) | |
| download | sway-8cc26130a66f533a5cbb8e4833a536dd8798f833.tar.gz sway-8cc26130a66f533a5cbb8e4833a536dd8798f833.tar.zst sway-8cc26130a66f533a5cbb8e4833a536dd8798f833.zip | |
Merge pull request #2194 from RyanDwyer/fix-incorrect-render
Don't return pending children in seat_get_active_current_child
| -rw-r--r-- | sway/input/seat.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index 2c2087da..a934d4a8 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
| @@ -832,12 +832,12 @@ struct sway_container *seat_get_active_child(struct sway_seat *seat, | |||
| 832 | 832 | ||
| 833 | struct sway_container *seat_get_active_current_child(struct sway_seat *seat, | 833 | struct sway_container *seat_get_active_current_child(struct sway_seat *seat, |
| 834 | struct sway_container *container) { | 834 | struct sway_container *container) { |
| 835 | struct sway_container *child = seat_get_active_child(seat, container); | 835 | struct sway_seat_container *current = NULL; |
| 836 | if (child) { | 836 | wl_list_for_each(current, &seat->focus_stack, link) { |
| 837 | return child; | 837 | if (current->container->current.parent == container && |
| 838 | } | 838 | current->container->current.layout != L_FLOATING) { |
| 839 | if (container->current.children->length == 1) { | 839 | return current->container; |
| 840 | return container->current.children->items[0]; | 840 | } |
| 841 | } | 841 | } |
| 842 | return NULL; | 842 | return NULL; |
| 843 | } | 843 | } |