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: calculate usable_area before positioning clients

Browse source 
This ensures that the usable area is completely calculated
before non exclusive-zone clients are positioned / resized.

Fixes #1285
Reported-by: @spl237
This commit is contained in:
Consolatis 2023-12-06 14:24:17 +01:00 • committed by Johan Malm
parent 5bc58fc381
commit d59b1d0966
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/layers.c
View file

@ -78,16 +78,29 @@ layers_arrange(struct output *output)
return; return;
} }
for (size_t i = 0; i < ARRAY_SIZE(output->layer_tree); i++) { for (int i = ARRAY_SIZE(output->layer_tree) - 1; i >= 0; i--) {
struct wlr_scene_tree *layer = output->layer_tree[i]; struct wlr_scene_tree *layer = output->layer_tree[i];
/* /*
* Process exclusive-zone clients before non-exclusive-zone * Process exclusive-zone clients before non-exclusive-zone
* clients, so that the latter give way to the former regardless * clients, so that the latter give way to the former regardless
* of the order in which they were launched. * of the order in which they were launched.
*
* Also start calculating the usable_area for exclusive-zone
* clients from the Overlay layer down to the Background layer
* to ensure that higher layers have a higher preference for
* placement.
*
* The 'exclusive' boolean also matches -1 which means that
* the layershell client wants to use the full screen rather
* than the usable area.
*/ */
arrange_one_layer(&full_area, &usable_area, layer, true); arrange_one_layer(&full_area, &usable_area, layer, /* exclusive */ true);
arrange_one_layer(&full_area, &usable_area, layer, false); }
for (size_t i = 0; i < ARRAY_SIZE(output->layer_tree); i++) {
struct wlr_scene_tree *layer = output->layer_tree[i];
arrange_one_layer(&full_area, &usable_area, layer, /* exclusive */ false);
/* Set node position to account for output layout change */ /* Set node position to account for output layout change */
wlr_scene_node_set_position(&layer->node, scene_output->x, wlr_scene_node_set_position(&layer->node, scene_output->x,