brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

boxes: Move Rectangle.crop_and_scale to Mtk

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3501>
This commit is contained in:
Bilal Elmoussaoui 2024-01-06 19:36:22 +01:00 committed by Marge Bot
parent abe47769b7
commit 59457dff81
6 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mtk/mtk/mtk-rectangle.c
View File

@ -349,3 +349,22 @@ mtk_rectangle_from_graphene_rect (const graphene_rect_t *rect,
}
}
}
void
mtk_rectangle_crop_and_scale (const MtkRectangle *rect,
const graphene_rect_t *src_rect,
int dst_width,
int dst_height,
MtkRectangle *dest)
{
graphene_rect_t tmp = GRAPHENE_RECT_INIT (rect->x, rect->y,
rect->width, rect->height);
graphene_rect_scale (&tmp,
src_rect->size.width / dst_width,
src_rect->size.height / dst_height,
&tmp);
graphene_rect_offset (&tmp, src_rect->origin.x, src_rect->origin.y);
mtk_rectangle_from_graphene_rect (&tmp, MTK_ROUNDING_STRATEGY_GROW, dest);
}

6
mtk/mtk/mtk-rectangle.h
View File

@ -124,3 +124,9 @@ void mtk_rectangle_from_graphene_rect (const graphene_rect_t *rect,
MtkRoundingStrategy rounding_strategy,
MtkRectangle *dest);
MTK_EXPORT
void mtk_rectangle_crop_and_scale (const MtkRectangle *rect,
const graphene_rect_t *src_rect,
int dst_width,
int dst_height,
MtkRectangle *dest);

10
src/compositor/meta-shaped-texture.c
View File

@ -1113,11 +1113,11 @@ meta_shaped_texture_update_area (MetaShapedTexture *stex,
inverted_dst_width = ceilf (viewport.size.width);
inverted_dst_height = ceilf (viewport.size.height);
meta_rectangle_crop_and_scale (clip,
&inverted_viewport,
inverted_dst_width,
inverted_dst_height,
clip);
mtk_rectangle_crop_and_scale (clip,
&inverted_viewport,
inverted_dst_width,
inverted_dst_height,
clip);
}
meta_texture_mipmap_invalidate (stex->texture_mipmap);

10
src/compositor/region-utils.c
View File

@ -416,11 +416,11 @@ meta_region_crop_and_scale (MtkRegion *region,
{
rects[i] = mtk_region_get_rectangle (region, i);
meta_rectangle_crop_and_scale (&rects[i],
src_rect,
dst_width,
dst_height,
&rects[i]);
mtk_rectangle_crop_and_scale (&rects[i],
src_rect,
dst_width,
dst_height,
&rects[i]);
}
viewport_region = mtk_region_create_rectangles (rects, n_rects);

8
src/core/boxes-private.h
View File

@ -252,10 +252,4 @@ void meta_rectangle_transform (const MtkRectangle *rect,
MetaMonitorTransform transform,
int width,
int height,
MtkRectangle *dest);
void meta_rectangle_crop_and_scale (const MtkRectangle *rect,
graphene_rect_t *src_rect,
int dst_width,
int dst_height,
MtkRectangle *dest);
MtkRectangle *dest);

18
src/core/boxes.c
View File

@ -1946,21 +1946,3 @@ meta_rectangle_transform (const MtkRectangle *rect,
}
}
void
meta_rectangle_crop_and_scale (const MtkRectangle *rect,
graphene_rect_t *src_rect,
int dst_width,
int dst_height,
MtkRectangle *dest)
{
graphene_rect_t tmp = GRAPHENE_RECT_INIT (rect->x, rect->y,
rect->width, rect->height);
graphene_rect_scale (&tmp,
src_rect->size.width / dst_width,
src_rect->size.height / dst_height,
&tmp);
graphene_rect_offset (&tmp, src_rect->origin.x, src_rect->origin.y);
mtk_rectangle_from_graphene_rect (&tmp, MTK_ROUNDING_STRATEGY_GROW, dest);
}