mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Chase wlroots: scene_node.state is now inlined

Browse source 
Chases wlroots cb2dbc327e4d695c2a60a386e116a7dc20b29107
wlr_scene: Inline wlr_scene_node_state
This commit is contained in:
Consolatis 2022-06-05 15:55:18 +02:00 • committed by Johan Malm
parent 2ed7a10779
commit 08518513cc
8 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/debug.c
View file

@ -173,9 +173,9 @@ dump_tree(struct server *server, struct wlr_scene_node *node,
return;
}
struct wlr_scene_node *child;
wl_list_for_each(child, &node->state.children, state.link) {
wl_list_for_each(child, &node->children, link) {
dump_tree(server, child, pos + INDENT_SIZE,
x + child->state.x, y + child->state.y);
x + child->x, y + child->y);
}
}

4
src/layers.c
View file

@ -230,8 +230,8 @@ move_popup_to_top_layer(struct lab_layer_surface *toplevel,
struct output *output = output_from_wlr_output(server, wlr_output);
struct wlr_box box = { 0 };
wlr_output_layout_get_box(server->output_layout, wlr_output, &box);
int lx = toplevel->scene_layer_surface->tree->node.state.x + box.x;
int ly = toplevel->scene_layer_surface->tree->node.state.y + box.y;
int lx = toplevel->scene_layer_surface->tree->node.x + box.x;
int ly = toplevel->scene_layer_surface->tree->node.y + box.y;
struct wlr_scene_node *node = &popup->scene_tree->node;
wlr_scene_node_reparent(node, output->layer_popup_tree);

2
src/menu/menu.c
View file

@ -435,7 +435,7 @@ menu_configure(struct menu *menu, int lx, int ly, enum menu_align align)
} else {
new_lx = lx;
}
rel_y = item->tree->node.state.y;
rel_y = item->tree->node.y;
new_ly = ly + rel_y - theme->menu_overlap_y;
menu_configure(item->submenu, new_lx, new_ly, align);
}

4
src/osd.c
View file

@ -96,8 +96,8 @@ static void
destroy_osd_nodes(struct output *output)
{
struct wlr_scene_node *child, *next;
struct wl_list *children = &output->osd_tree->node.state.children;
wl_list_for_each_safe(child, next, children, state.link) {
struct wl_list *children = &output->osd_tree->node.children;
wl_list_for_each_safe(child, next, children, link) {
wlr_scene_node_destroy(child);
}
}

4
src/ssd/ssd.c
View file

@ -169,11 +169,11 @@ ssd_update_geometry(struct view *view)
}
if (!view->ssd.enabled) {
if (view->ssd.tree->node.state.enabled) {
if (view->ssd.tree->node.enabled) {
wlr_scene_node_set_enabled(&view->ssd.tree->node, false);
}
return;
} else if (!view->ssd.tree->node.state.enabled) {
} else if (!view->ssd.tree->node.enabled) {
wlr_scene_node_set_enabled(&view->ssd.tree->node, true);
}

8
src/ssd/ssd_extents.c
View file

@ -99,7 +99,7 @@ ssd_extents_update(struct view *view)
wlr_scene_node_set_enabled(&view->ssd.extents.tree->node, false);
return;
}
if (!view->ssd.extents.tree->node.state.enabled) {
if (!view->ssd.extents.tree->node.enabled) {
wlr_scene_node_set_enabled(&view->ssd.extents.tree->node, true);
}
@ -177,7 +177,7 @@ ssd_extents_update(struct view *view)
/* Not visible */
wlr_scene_node_set_enabled(part->node, false);
continue;
} else if (!part->node->state.enabled) {
} else if (!part->node->enabled) {
wlr_scene_node_set_enabled(part->node, true);
}
@ -193,8 +193,8 @@ ssd_extents_update(struct view *view)
}
/* Fully visible */
if (target->x != part->node->state.x
|| target->y != part->node->state.y) {
if (target->x != part->node->x
|| target->y != part->node->y) {
wlr_scene_node_set_position(part->node, target->x, target->y);
}
if (target->width != rect->width || target->height != rect->height) {

4
src/ssd/ssd_titlebar.c
View file

@ -287,14 +287,14 @@ ssd_button_hover_enable(struct view *view, enum ssd_part_type type)
struct ssd_part *part;
struct ssd_sub_tree *subtree;
FOR_EACH_STATE(view, subtree) {
if (subtree->tree->node.state.enabled) {
if (subtree->tree->node.enabled) {
part = ssd_get_part(&subtree->parts, type);
if (!part) {
wlr_log(WLR_ERROR, "hover enable failed to find button");
return NULL;
}
struct wlr_scene_node *child;
wl_list_for_each_reverse(child, &part->node->state.children, state.link) {
wl_list_for_each_reverse(child, &part->node->children, link) {
if (child->type == WLR_SCENE_NODE_RECT) {
wlr_scene_node_set_enabled(child, true);
return child;

2
subprojects/wlroots.wrap
View file

@ -1,6 +1,6 @@
[wrap-git]
url = https://gitlab.freedesktop.org/wlroots/wlroots.git
revision = ccd0f85c2a36308e35b153c7f9653abac7659af3
revision = cb2dbc327e4d695c2a60a386e116a7dc20b29107
[provide]
dependency_names = wlroots