mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-08 10:06:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

menu: put menu_tree above overlay layer

Browse source
This commit is contained in:
Johan Malm 2024-07-01 21:47:19 +01:00 • committed by Hiroaki Yamamoto
parent ac7c94db12
commit 86c35976ba
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/output.c
View file

@ -459,6 +459,7 @@ new_output_notify(struct wl_listener *listener, void *data)
* Set the z-positions to achieve the following order (from top to * Set the z-positions to achieve the following order (from top to
* bottom): * bottom):
* - session lock layer * - session lock layer
* - compositor menu
* - layer-shell popups * - layer-shell popups
* - overlay layer * - overlay layer
* - top layer * - top layer
@ -471,6 +472,7 @@ new_output_notify(struct wl_listener *listener, void *data)
wlr_scene_node_raise_to_top(&output->layer_tree[2]->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_tree[3]->node);
wlr_scene_node_raise_to_top(&output->layer_popup_tree->node); wlr_scene_node_raise_to_top(&output->layer_popup_tree->node);
wlr_scene_node_raise_to_top(&server->menu_tree->node);
wlr_scene_node_raise_to_top(&output->session_lock_tree->node); wlr_scene_node_raise_to_top(&output->session_lock_tree->node);
configure_new_output(server, output); configure_new_output(server, output);

6
src/server.c
View file

@ -556,6 +556,7 @@ server_init(struct server *server)
* | Type | Scene Tree | Per Output | Example * | Type | Scene Tree | Per Output | Example
* | ----------------- | ---------------- | ---------- | ------- * | ----------------- | ---------------- | ---------- | -------
* | ext-session | lock-screen | Yes | swaylock * | ext-session | lock-screen | Yes | swaylock
* | compositor-menu | menu_tree | No | root-menu
* | layer-shell | layer-popups | Yes | * | layer-shell | layer-popups | Yes |
* | layer-shell | overlay-layer | Yes | * | layer-shell | overlay-layer | Yes |
* | layer-shell | top-layer | Yes | waybar * | layer-shell | top-layer | Yes | waybar
@ -576,6 +577,11 @@ server_init(struct server *server)
#if HAVE_XWAYLAND #if HAVE_XWAYLAND
server->unmanaged_tree = wlr_scene_tree_create(&server->scene->tree); server->unmanaged_tree = wlr_scene_tree_create(&server->scene->tree);
#endif #endif
/*
* menu_tree is moved to top in new_output_notify() when layer-shell
* layers are positioned
*/
server->menu_tree = wlr_scene_tree_create(&server->scene->tree); server->menu_tree = wlr_scene_tree_create(&server->scene->tree);
workspaces_init(server); workspaces_init(server);