From 8bffb941c9a4791558e66bf0ce35af268c208203 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 20 Sep 2021 18:46:55 +0200 Subject: scene: use scene_node_get_size in wlr_scene_node_at This allows to unify the RECT and BUFFER code-paths. The BUFFER one will become more complicated with destination size and transforms. --- wlr_scene.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/wlr_scene.c b/wlr_scene.c index 4004b50..2d3dccd 100644 --- a/wlr_scene.c +++ b/wlr_scene.c @@ -528,14 +528,11 @@ struct wlr_scene_node *wlr_scene_node_at(struct wlr_scene_node *node, struct wlr_scene_surface *scene_surface = wlr_scene_surface_from_node(node); intersects = wlr_surface_point_accepts_input(scene_surface->surface, lx, ly); break; - case WLR_SCENE_NODE_RECT:; - struct wlr_scene_rect *rect = scene_rect_from_node(node); - intersects = lx >= 0 && lx < rect->width && ly >= 0 && ly < rect->height; - break; + case WLR_SCENE_NODE_RECT: case WLR_SCENE_NODE_BUFFER:; - struct wlr_scene_buffer *scene_buffer = scene_buffer_from_node(node); - intersects = lx >= 0 && lx < scene_buffer->buffer->width && - ly >= 0 && ly < scene_buffer->buffer->height; + int width, height; + scene_node_get_size(node, &width, &height); + intersects = lx >= 0 && lx < width && ly >= 0 && ly < height; break; } -- cgit v1.2.3