mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libweston: Convert struct weston_subsurface to weston_coord 

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman 2022-02-03 17:07:06 -06:00
parent 4a2e7c9f1f
commit 989cdcb86e
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/libweston/libweston.h
View File

@ -1757,8 +1757,7 @@ struct weston_subsurface {
struct wl_list parent_link_pending;
struct {
int32_t x;
int32_t y;
struct weston_coord_surface offset;
int set;
} position;

17
libweston/compositor.c
View File

@ -2892,8 +2892,8 @@ view_list_add_subsurface_view(struct weston_compositor *compositor,
view = weston_view_create(sub->surface);
weston_view_set_transform_parent(view, parent);
weston_view_set_rel_position(view,
sub->position.x,
sub->position.y);
sub->position.offset.c.x,
sub->position.offset.c.y);
}
view->parent_view = parent;
@ -4507,8 +4507,8 @@ weston_subsurface_parent_commit(struct weston_subsurface *sub,
if (sub->position.set) {
wl_list_for_each(view, &sub->surface->views, surface_link)
weston_view_set_rel_position(view,
sub->position.x,
sub->position.y);
sub->position.offset.c.x,
sub->position.offset.c.y);
sub->position.set = 0;
}
@ -4662,8 +4662,8 @@ weston_surface_get_bounding_box(struct weston_surface *surface)
wl_list_for_each(subsurface, &surface->subsurface_list, parent_link)
pixman_region32_union_rect(&region, &region,
subsurface->position.x,
subsurface->position.y,
subsurface->position.offset.c.x,
subsurface->position.offset.c.y,
subsurface->surface->width,
subsurface->surface->height);
@ -4761,8 +4761,7 @@ subsurface_set_position(struct wl_client *client,
if (!sub)
return;
sub->position.x = x;
sub->position.y = y;
sub->position.offset = weston_coord_surface(x, y, sub->surface);
sub->position.set = 1;
}
@ -5022,6 +5021,8 @@ weston_subsurface_create(uint32_t id, struct weston_surface *surface,
return NULL;
}
sub->position.offset = weston_coord_surface(0, 0, surface);
wl_resource_set_implementation(sub->resource,
&subsurface_implementation,
sub, subsurface_resource_destroy);

4
libweston/shell-utils/shell-utils.c
View File

@ -103,8 +103,8 @@ weston_shell_utils_subsurfaces_boundingbox(struct weston_surface *surface,
wl_list_for_each(subsurface, &surface->subsurface_list, parent_link) {
pixman_region32_union_rect(&region, &region,
subsurface->position.x,
subsurface->position.y,
subsurface->position.offset.c.x,
subsurface->position.offset.c.y,
subsurface->surface->width,
subsurface->surface->height);
}