From 19f3a6ef83686dd573b47ed8d2428ddaff7db1fe Mon Sep 17 00:00:00 2001 From: Johan Malm Date: Thu, 3 Mar 2022 18:20:16 +0000 Subject: [PATCH] output: attach node-descriptors to node-trees --- include/node.h | 1 + src/output.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/node.h b/include/node.h index 5cc7220e..5704761c 100644 --- a/include/node.h +++ b/include/node.h @@ -15,6 +15,7 @@ enum node_descriptor_type { LAB_NODE_DESC_LAYER_SURFACE, LAB_NODE_DESC_LAYER_POPUP, LAB_NODE_DESC_MENUITEM, + LAB_NODE_DESC_TREE, }; struct node_descriptor { diff --git a/src/output.c b/src/output.c index fbd629a1..d24f422b 100644 --- a/src/output.c +++ b/src/output.c @@ -19,6 +19,7 @@ #include "labwc.h" #include "layers.h" #include "menu/menu.h" +#include "node.h" #include "ssd.h" #include "theme.h" @@ -120,9 +121,12 @@ new_output_notify(struct wl_listener *listener, void *data) wl_list_init(&output->layers[i]); output->layer_tree[i] = wlr_scene_tree_create(&server->scene->node); - output->layer_tree[i]->node.data = output->wlr_output; + node_descriptor_create(&output->layer_tree[i]->node, + LAB_NODE_DESC_TREE, NULL); } output->layer_popup_tree = wlr_scene_tree_create(&server->scene->node); + node_descriptor_create(&output->layer_popup_tree->node, + LAB_NODE_DESC_TREE, NULL); /* * Set the z-positions to achieve the following order (from top to