view: replace content_node with content_tree

diff --git a/include/view.h b/include/view.h
index bec6431d1b85282b574ce76c0293714a8c08fecb..fa84911202ff27544c1882bb97567c8d386a5c8d 100644 (file)
--- a/include/view.h
+++ b/include/view.h
@@ -193,7 +193,7 @@ struct view {
        struct workspace *workspace;
        struct wlr_surface *surface;
        struct wlr_scene_tree *scene_tree;
-       struct wlr_scene_node *content_node;
+       struct wlr_scene_tree *content_tree;
 
        bool mapped;
        bool been_mapped;

diff --git a/src/debug.c b/src/debug.c
index 01c64ad2fc0acbddf482009d615687696a3c4a1a..43ae0c0657f5cebceb27d735ed29c92b78094220 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -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) {

diff --git a/src/input/ime.c b/src/input/ime.c
index 322bb18381bea646a8df7ef019ff57ef1b23edb0..07b996ec881aa7ee9743eba1211b04843b20cbe3 100644 (file)
--- a/src/input/ime.c
+++ b/src/input/ime.c
@@ -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
                 */

diff --git a/src/view.c b/src/view.c
index f2de55ed1de3c95781abf10e26524b0768249098..cc5af20df97edfe9d1d2dc457b2ca855efb5330e 100644 (file)
--- a/src/view.c
+++ b/src/view.c
@@ -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);

diff --git a/src/xdg.c b/src/xdg.c
index 033ba5219f1015061746f0c6f70917d67494319d..cd2200f2a5f7bf4f0c297ab4bf70459e9a731469 100644 (file)
--- a/src/xdg.c
+++ b/src/xdg.c
@@ -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);
 

diff --git a/src/xwayland.c b/src/xwayland.c
index 5fef5ee85c4547c50ac0e6e8a0b91bd0a25c1e23..1eb9c1a367875d213368f47dbeb5a149200452e4 100644 (file)
--- a/src/xwayland.c
+++ b/src/xwayland.c
@@ -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;
        }
 
        /*