view: replace content_node with content_tree

This commit is contained in:
tokyo4j 2025-01-19 15:49:39 +09:00 committed by Consolatis
parent 40b1f5407f
commit 4b7c502ace
6 changed files with 7 additions and 7 deletions

View file

@ -76,8 +76,8 @@ get_view_part(struct view *view, struct wlr_scene_node *node)
snprintf(view_name, sizeof(view_name), "view (%s)", app_id);
return view_name;
}
if (node == view->content_node) {
return "view->content_node";
if (node == &view->content_tree->node) {
return "view->content_tree";
}
if (view->resize_indicator.tree
&& node == &view->resize_indicator.tree->node) {

View file

@ -218,7 +218,7 @@ update_popup_position(struct input_method_popup *popup)
/*
* wlr_surface->data is:
* - for XDG surfaces: view->content_node
* - for XDG surfaces: view->content_tree
* - for layer surfaces: lab_layer_surface->scene_layer_surface->tree
* - for layer popups: lab_layer_popup->scene_tree
*/

View file

@ -2474,7 +2474,7 @@ view_set_shade(struct view *view, bool shaded)
view->shaded = shaded;
ssd_enable_shade(view->ssd, view->shaded);
wlr_scene_node_set_enabled(view->content_node, !view->shaded);
wlr_scene_node_set_enabled(&view->content_tree->node, !view->shaded);
if (view->impl->shade) {
view->impl->shade(view, shaded);

View file

@ -934,7 +934,7 @@ xdg_toplevel_new(struct wl_listener *listener, void *data)
free(xdg_toplevel_view);
return;
}
view->content_node = &tree->node;
view->content_tree = tree;
node_descriptor_create(&view->scene_tree->node,
LAB_NODE_DESC_VIEW, view);

View file

@ -735,7 +735,7 @@ xwayland_view_map(struct view *view)
wl_resource_post_no_memory(view->surface->resource);
return;
}
view->content_node = &tree->node;
view->content_tree = tree;
}
/*