mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

layers: put popups in separate node-tree

Browse source 
This allows popups to be rendered above views and other layers. Without
this, the popups of a layer-shell application in the bottom layer would
render below views, which does not seem right. For example, consider the
case of a panel with right-click popups.
This commit is contained in:
Johan Malm 2022-03-03 17:56:38 +00:00
parent 34bd1fb6da
commit 6fd400b493
3 changed files with 36 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/output.c
View file

@ -111,6 +111,10 @@ new_output_notify(struct wl_listener *listener, void *data)
output->frame.notify = output_frame_notify;
wl_signal_add(&wlr_output->events.frame, &output->frame);
/*
* Create layer-trees (background, bottom, top and overlay) and
* a layer-popup-tree.
*/
int nr_layers = sizeof(output->layers) / sizeof(output->layers[0]);
for (int i = 0; i < nr_layers; i++) {
wl_list_init(&output->layers[i]);
@ -118,10 +122,23 @@ new_output_notify(struct wl_listener *listener, void *data)
wlr_scene_tree_create(&server->scene->node);
output->layer_tree[i]->node.data = output->wlr_output;
}
output->layer_popup_tree = wlr_scene_tree_create(&server->scene->node);
/*
* Set the z-positions to achieve the following order (from top to
* bottom):
* - layer-shell popups
* - overlay layer
* - top layer
* - views
* - bottom layer
* - background layer
*/
wlr_scene_node_lower_to_bottom(&output->layer_tree[1]->node);
wlr_scene_node_lower_to_bottom(&output->layer_tree[0]->node);
wlr_scene_node_raise_to_top(&output->layer_tree[2]->node);
wlr_scene_node_raise_to_top(&output->layer_tree[3]->node);
wlr_scene_node_raise_to_top(&output->layer_popup_tree->node);
if (rc.adaptive_sync) {
wlr_log(WLR_INFO, "enable adaptive sync on %s",