diff options
author | Simon Ser <contact@emersion.fr> | 2021-06-01 12:24:12 +0200 |
---|---|---|
committer | Kenny Levinsen <kl@kl.wtf> | 2021-06-24 18:10:01 +0200 |
commit | 0d1231a6d156e6b658c631e9a2f70d43e2c2977b (patch) | |
tree | 893456eecd105156e674343136e4d92adc8c1ad3 | |
parent | remove usage of `wlr_texture_get_size` (diff) | |
download | sway-0d1231a6d156e6b658c631e9a2f70d43e2c2977b.tar.gz sway-0d1231a6d156e6b658c631e9a2f70d43e2c2977b.tar.zst sway-0d1231a6d156e6b658c631e9a2f70d43e2c2977b.zip |
Iterate over subsurfaces below the parent surface
Update for the breaking change in [1].
[1]: https://github.com/swaywm/wlroots/pull/2948
(cherry picked from commit 3162766eef14be71789478b0984bc2c1802832b2)
-rw-r--r-- | sway/tree/view.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c index c762fa22..124b4621 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c | |||
@@ -1031,7 +1031,10 @@ static void view_child_handle_surface_destroy(struct wl_listener *listener, | |||
1031 | static void view_init_subsurfaces(struct sway_view *view, | 1031 | static void view_init_subsurfaces(struct sway_view *view, |
1032 | struct wlr_surface *surface) { | 1032 | struct wlr_surface *surface) { |
1033 | struct wlr_subsurface *subsurface; | 1033 | struct wlr_subsurface *subsurface; |
1034 | wl_list_for_each(subsurface, &surface->subsurfaces, parent_link) { | 1034 | wl_list_for_each(subsurface, &surface->subsurfaces_below, parent_link) { |
1035 | view_subsurface_create(view, subsurface); | ||
1036 | } | ||
1037 | wl_list_for_each(subsurface, &surface->subsurfaces_above, parent_link) { | ||
1035 | view_subsurface_create(view, subsurface); | 1038 | view_subsurface_create(view, subsurface); |
1036 | } | 1039 | } |
1037 | } | 1040 | } |
@@ -1039,7 +1042,10 @@ static void view_init_subsurfaces(struct sway_view *view, | |||
1039 | static void view_child_init_subsurfaces(struct sway_view_child *view_child, | 1042 | static void view_child_init_subsurfaces(struct sway_view_child *view_child, |
1040 | struct wlr_surface *surface) { | 1043 | struct wlr_surface *surface) { |
1041 | struct wlr_subsurface *subsurface; | 1044 | struct wlr_subsurface *subsurface; |
1042 | wl_list_for_each(subsurface, &surface->subsurfaces, parent_link) { | 1045 | wl_list_for_each(subsurface, &surface->subsurfaces_below, parent_link) { |
1046 | view_child_subsurface_create(view_child, subsurface); | ||
1047 | } | ||
1048 | wl_list_for_each(subsurface, &surface->subsurfaces_above, parent_link) { | ||
1043 | view_child_subsurface_create(view_child, subsurface); | 1049 | view_child_subsurface_create(view_child, subsurface); |
1044 | } | 1050 | } |
1045 | } | 1051 | } |