Chase wlroots: every scene_node parent is now a tree

Chases wlroots ccd0f85c2a36308e35b153c7f9653abac7659af3
wlr_scene: Only allow parenting on a wlr_scene_tree
This commit is contained in:
Consolatis 2022-06-05 15:17:35 +02:00 committed by Johan Malm
parent b7c9d0e055
commit 2ed7a10779
20 changed files with 97 additions and 93 deletions

View file

@ -93,7 +93,7 @@ get_special(struct server *server, struct wlr_scene_node *node,
if (node == &server->menu_tree->node) {
return "server->menu_tree";
}
if (node->parent == &server->scene->tree.node) {
if (node->parent == &server->scene->tree) {
struct output *output;
wl_list_for_each(output, &server->outputs, link) {
if (node == &output->osd_tree->node) {
@ -117,9 +117,8 @@ get_special(struct server *server, struct wlr_scene_node *node,
if (node == &server->view_tree_always_on_top->node) {
return "server->view_tree_always_on_top";
}
if (node->parent == &server->view_tree->node ||
node->parent == &server->view_tree_always_on_top->node) {
*last_view = node_view_from_node(node);
if (node->parent == server->view_tree ||
node->parent == server->view_tree_always_on_top) {
*last_view = node_view_from_node(node);
}
const char *view_part = get_view_part(*last_view, node);