diff options
| author | Isaac Freund <ifreund@ifreund.xyz> | 2020-06-30 16:05:06 +0200 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2020-06-30 16:19:00 +0200 |
| commit | 76adcc3fd3aca74bf45db69d6dbcf3a8443ff159 (patch) | |
| tree | 4fea1953bb42937706baf2860f6c5378025a7593 | |
| parent | 492267a5d6924e4f3a2e2326240eb064c3d2d7c2 (diff) | |
output: simplify loop over layer surfaces
| -rw-r--r-- | sway/desktop/output.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 2a2e332a1..4a51b5cc7 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -434,18 +434,10 @@ struct sway_workspace *output_get_active_workspace(struct sway_output *output) { } bool output_has_opaque_overlay_layer_surface(struct sway_output *output) { - struct wlr_layer_surface_v1 *wlr_layer_surface_v1; - wl_list_for_each(wlr_layer_surface_v1, &server.layer_shell->surfaces, link) { - if (wlr_layer_surface_v1->output != output->wlr_output || - wlr_layer_surface_v1->current.layer != ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY) { - continue; - } - struct wlr_surface *wlr_surface = wlr_layer_surface_v1->surface; - struct sway_layer_surface *sway_layer_surface = - layer_from_wlr_layer_surface_v1(wlr_layer_surface_v1); - if (sway_layer_surface == NULL) { - continue; - } + struct sway_layer_surface *sway_layer_surface; + wl_list_for_each(sway_layer_surface, + &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], link) { + struct wlr_surface *wlr_surface = sway_layer_surface->layer_surface->surface; pixman_box32_t output_box = { .x2 = output->width, .y2 = output->height, |