diff options
| -rw-r--r-- | sway/desktop/layer_shell.c | 7 | ||||
| -rw-r--r-- | sway/desktop/output.c | 2 | ||||
| -rw-r--r-- | sway/input/seat.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c index a9803d21..5f2b74cd 100644 --- a/sway/desktop/layer_shell.c +++ b/sway/desktop/layer_shell.c @@ -487,7 +487,9 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) { struct wlr_layer_surface_v1 *layer_surface = data; sway_log(SWAY_DEBUG, "new layer surface: namespace %s layer %d anchor %d " "size %dx%d margin %d,%d,%d,%d", - layer_surface->namespace, layer_surface->layer, layer_surface->layer, + layer_surface->namespace, + layer_surface->client_pending.layer, + layer_surface->client_pending.layer, layer_surface->client_pending.desired_width, layer_surface->client_pending.desired_height, layer_surface->client_pending.margin.top, @@ -544,7 +546,8 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) { sway_layer->output_destroy.notify = handle_output_destroy; wl_signal_add(&output->events.destroy, &sway_layer->output_destroy); - wl_list_insert(&output->layers[layer_surface->layer], &sway_layer->link); + wl_list_insert(&output->layers[layer_surface->client_pending.layer], + &sway_layer->link); // Temporarily set the layer's current state to client_pending // So that we can easily arrange it diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 7f250542..36e406c3 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -375,7 +375,7 @@ 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->layer != ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY) { + wlr_layer_surface_v1->current.layer != ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY) { continue; } struct wlr_surface *wlr_surface = wlr_layer_surface_v1->surface; diff --git a/sway/input/seat.c b/sway/input/seat.c index ebd40343..7b0fe67d 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -1120,7 +1120,7 @@ void seat_set_focus_layer(struct sway_seat *seat, } assert(layer->mapped); seat_set_focus_surface(seat, layer->surface, true); - if (layer->layer >= ZWLR_LAYER_SHELL_V1_LAYER_TOP) { + if (layer->current.layer >= ZWLR_LAYER_SHELL_V1_LAYER_TOP) { seat->focused_layer = layer; } } |