mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-20 05:34:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

view: replace content_node with content_tree

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
include/view.h
View file

@ -193,7 +193,7 @@ struct view {
struct workspace *workspace; struct workspace *workspace;
struct wlr_surface *surface; struct wlr_surface *surface;
struct wlr_scene_tree *scene_tree; struct wlr_scene_tree *scene_tree;
struct wlr_scene_node *content_node; struct wlr_scene_tree *content_tree;
bool mapped; bool mapped;
bool been_mapped; bool been_mapped;

4
src/debug.c
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); snprintf(view_name, sizeof(view_name), "view (%s)", app_id);
return view_name; return view_name;
} }
if (node == view->content_node) { if (node == &view->content_tree->node) {
return "view->content_node"; return "view->content_tree";
} }
if (view->resize_indicator.tree if (view->resize_indicator.tree
&& node == &view->resize_indicator.tree->node) { && node == &view->resize_indicator.tree->node) {

2
src/input/ime.c
View file

@ -218,7 +218,7 @@ update_popup_position(struct input_method_popup *popup)
/* /*
* wlr_surface->data is: * 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 surfaces: lab_layer_surface->scene_layer_surface->tree
* - for layer popups: lab_layer_popup->scene_tree * - for layer popups: lab_layer_popup->scene_tree
*/ */

2
src/view.c
View file

@ -2474,7 +2474,7 @@ view_set_shade(struct view *view, bool shaded)
view->shaded = shaded; view->shaded = shaded;
ssd_enable_shade(view->ssd, view->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) { if (view->impl->shade) {
view->impl->shade(view, shaded); view->impl->shade(view, shaded);

2
src/xdg.c
View file

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

2
src/xwayland.c
View file

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