layer-shell: use unified map logic

This commit is contained in:
Kirill Primak 2023-03-04 22:42:40 +03:00 committed by Isaac Freund
parent b0437fc416
commit c63f3659c5
3 changed files with 19 additions and 55 deletions

View file

@ -129,7 +129,7 @@ void wlr_scene_layer_surface_v1_configure(
wlr_scene_node_set_position(&scene_layer_surface->tree->node, box.x, box.y);
wlr_layer_surface_v1_configure(layer_surface, box.width, box.height);
if (layer_surface->mapped && state->exclusive_zone > 0) {
if (layer_surface->surface->mapped && state->exclusive_zone > 0) {
layer_surface_exclusive_zone(state, usable_area);
}
}
@ -171,16 +171,16 @@ struct wlr_scene_layer_surface_v1 *wlr_scene_layer_surface_v1_create(
scene_layer_surface->layer_surface_map.notify =
scene_layer_surface_handle_layer_surface_map;
wl_signal_add(&layer_surface->events.map,
wl_signal_add(&layer_surface->surface->events.map,
&scene_layer_surface->layer_surface_map);
scene_layer_surface->layer_surface_unmap.notify =
scene_layer_surface_handle_layer_surface_unmap;
wl_signal_add(&layer_surface->events.unmap,
wl_signal_add(&layer_surface->surface->events.unmap,
&scene_layer_surface->layer_surface_unmap);
wlr_scene_node_set_enabled(&scene_layer_surface->tree->node,
layer_surface->mapped);
layer_surface->surface->mapped);
return scene_layer_surface;
}