diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-04-22 10:54:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-22 10:54:15 +0200 |
| commit | 12bf39a715b23b572e3ce213ee1aef8c32ebbc13 (patch) | |
| tree | c372a2212a94bc282876c41649c8c18204ff0761 /rootston | |
| parent | 704bc490a7d1ce581ba24ce833919036374293f9 (diff) | |
| parent | 3bce5dfc9f288ffcfa045ae0a80bcc015d0966c5 (diff) | |
Merge pull request #885 from emersion/remove-surface-subsurface
Remove wlr_surface::subsurface, add wlr_subcompositor
Diffstat (limited to 'rootston')
| -rw-r--r-- | rootston/desktop.c | 2 | ||||
| -rw-r--r-- | rootston/output.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/rootston/desktop.c b/rootston/desktop.c index 4edcb5e3..6ddf56b8 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -459,7 +459,7 @@ void view_map(struct roots_view *view, struct wlr_surface *surface) { view->wlr_surface = surface; struct wlr_subsurface *subsurface; - wl_list_for_each(subsurface, &view->wlr_surface->subsurface_list, + wl_list_for_each(subsurface, &view->wlr_surface->subsurfaces, parent_link) { subsurface_create(view, subsurface); } diff --git a/rootston/output.c b/rootston/output.c index 75bbd928..791b2819 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -318,7 +318,7 @@ static void render_view(struct roots_view *view, struct render_data *data) { } static bool has_standalone_surface(struct roots_view *view) { - if (!wl_list_empty(&view->wlr_surface->subsurface_list)) { + if (!wl_list_empty(&view->wlr_surface->subsurfaces)) { return false; } |