mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-21 15:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

layer_shell: Arrange exclusive zone clients first

Browse source 
This makes layer_shell more stable against the order of clients.
This commit is contained in:
Alexander Orzechowski 2024-10-14 16:03:55 -04:00 committed by Kenny Levinsen
parent db76fefd0c
commit ce6b2db0f2
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sway/desktop/layer_shell.c
View file

@ -54,7 +54,7 @@ struct wlr_layer_surface_v1 *toplevel_layer_surface_from_surface(
} }
static void arrange_surface(struct sway_output *output, const struct wlr_box *full_area, static void arrange_surface(struct sway_output *output, const struct wlr_box *full_area,
struct wlr_box *usable_area, struct wlr_scene_tree *tree) { struct wlr_box *usable_area, struct wlr_scene_tree *tree, bool exclusive) {
struct wlr_scene_node *node; struct wlr_scene_node *node;
wl_list_for_each(node, &tree->children, link) { wl_list_for_each(node, &tree->children, link) {
struct sway_layer_surface *surface = scene_descriptor_try_get(node, struct sway_layer_surface *surface = scene_descriptor_try_get(node,
@ -68,6 +68,10 @@ static void arrange_surface(struct sway_output *output, const struct wlr_box *fu
continue; continue;
} }
if ((surface->scene->layer_surface->current.exclusive_zone > 0) != exclusive) {
continue;
}
wlr_scene_layer_surface_v1_configure(surface->scene, full_area, usable_area); wlr_scene_layer_surface_v1_configure(surface->scene, full_area, usable_area);
} }
} }
@ -78,10 +82,14 @@ void arrange_layers(struct sway_output *output) {
&usable_area.width, &usable_area.height); &usable_area.width, &usable_area.height);
const struct wlr_box full_area = usable_area; const struct wlr_box full_area = usable_area;
arrange_surface(output, &full_area, &usable_area, output->layers.shell_background); arrange_surface(output, &full_area, &usable_area, output->layers.shell_background, true);
arrange_surface(output, &full_area, &usable_area, output->layers.shell_bottom); arrange_surface(output, &full_area, &usable_area, output->layers.shell_background, false);
arrange_surface(output, &full_area, &usable_area, output->layers.shell_top); arrange_surface(output, &full_area, &usable_area, output->layers.shell_bottom, true);
arrange_surface(output, &full_area, &usable_area, output->layers.shell_overlay); arrange_surface(output, &full_area, &usable_area, output->layers.shell_bottom, false);
arrange_surface(output, &full_area, &usable_area, output->layers.shell_top, true);
arrange_surface(output, &full_area, &usable_area, output->layers.shell_top, false);
arrange_surface(output, &full_area, &usable_area, output->layers.shell_overlay, true);
arrange_surface(output, &full_area, &usable_area, output->layers.shell_overlay, false);
if (!wlr_box_equal(&usable_area, &output->usable_area)) { if (!wlr_box_equal(&usable_area, &output->usable_area)) {
sway_log(SWAY_DEBUG, "Usable area changed, rearranging output"); sway_log(SWAY_DEBUG, "Usable area changed, rearranging output");