mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

src/layers.c: ensure layers_arrange() is only called with an output set

Browse source
This commit is contained in:
Consolatis 2022-12-30 01:37:32 +01:00 • committed by Johan Malm
parent c241d89c7c
commit a4c1c4815e
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/layers.c
View file

@ -38,6 +38,7 @@ arrange_one_layer(struct output *output, const struct wlr_box *full_area,
void void
layers_arrange(struct output *output) layers_arrange(struct output *output)
{ {
assert(output);
struct wlr_box full_area = { 0 }; struct wlr_box full_area = { 0 };
wlr_output_effective_resolution(output->wlr_output, wlr_output_effective_resolution(output->wlr_output,
&full_area.width, &full_area.height); &full_area.width, &full_area.height);
@ -166,9 +167,13 @@ static void
handle_unmap(struct wl_listener *listener, void *data) handle_unmap(struct wl_listener *listener, void *data)
{ {
struct lab_layer_surface *layer = wl_container_of(listener, layer, unmap); struct lab_layer_surface *layer = wl_container_of(listener, layer, unmap);
layers_arrange(layer->scene_layer_surface->layer_surface->output->data); struct wlr_layer_surface_v1 *layer_surface =
layer->scene_layer_surface->layer_surface;
if (layer_surface->output) {
layers_arrange(layer_surface->output->data);
}
struct seat *seat = &layer->server->seat; struct seat *seat = &layer->server->seat;
if (seat->focused_layer == layer->scene_layer_surface->layer_surface) { if (seat->focused_layer == layer_surface) {
seat_set_focus_layer(seat, NULL); seat_set_focus_layer(seat, NULL);
} }
} }