blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scene: assert that node != sibling in place above/below 

Currently these functions remove the node from the scene if the sibling
argument is the same node as the node. To prevent confusion when
misusing this API, assert that the nodes are distinct and document this.
This commit is contained in:
Isaac Freund 2021-10-13 16:00:53 +02:00 committed by Simon Ser
parent dc22a06184
commit 2a8d385386
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wlr/types/wlr_scene.h
View File

@ -129,11 +129,13 @@ void wlr_scene_node_set_enabled(struct wlr_scene_node *node, bool enabled);
void wlr_scene_node_set_position(struct wlr_scene_node *node, int x, int y); void wlr_scene_node_set_position(struct wlr_scene_node *node, int x, int y);
/** /**
* Move the node right above the specified sibling. * Move the node right above the specified sibling.
* Asserts that node and sibling are distinct and share the same parent.
*/ */
void wlr_scene_node_place_above(struct wlr_scene_node *node, void wlr_scene_node_place_above(struct wlr_scene_node *node,
struct wlr_scene_node *sibling); struct wlr_scene_node *sibling);
/** /**
* Move the node right below the specified sibling. * Move the node right below the specified sibling.
* Asserts that node and sibling are distinct and share the same parent.
*/ */
void wlr_scene_node_place_below(struct wlr_scene_node *node, void wlr_scene_node_place_below(struct wlr_scene_node *node,
struct wlr_scene_node *sibling); struct wlr_scene_node *sibling);

2
types/scene/wlr_scene.c
View File

@ -440,6 +440,7 @@ void wlr_scene_node_set_position(struct wlr_scene_node *node, int x, int y) {
void wlr_scene_node_place_above(struct wlr_scene_node *node, void wlr_scene_node_place_above(struct wlr_scene_node *node,
struct wlr_scene_node *sibling) { struct wlr_scene_node *sibling) {
assert(node != sibling);
assert(node->parent == sibling->parent); assert(node->parent == sibling->parent);
if (node->state.link.prev == &sibling->state.link) { if (node->state.link.prev == &sibling->state.link) {
@ -455,6 +456,7 @@ void wlr_scene_node_place_above(struct wlr_scene_node *node,
void wlr_scene_node_place_below(struct wlr_scene_node *node, void wlr_scene_node_place_below(struct wlr_scene_node *node,
struct wlr_scene_node *sibling) { struct wlr_scene_node *sibling) {
assert(node != sibling);
assert(node->parent == sibling->parent); assert(node->parent == sibling->parent);
if (node->state.link.next == &sibling->state.link) { if (node->state.link.next == &sibling->state.link) {