AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 13:41:07 +00:00
Code Issues Projects Releases Wiki Activity

gsk: Normalize when transforming bounds

Browse Source 
Bounds are assumed to be normalized, and transforms
with negative scales or 3d rotations can make us get
negative sizes.

Fix by Benjamin Otte.
This commit is contained in:
Matthias Clasen 2020-09-28 11:23:51 -04:00
parent 8487e82133
commit 431f144f37
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gsk/gsktransform.c
View File

@ -1793,10 +1793,11 @@ gsk_transform_transform_bounds (GskTransform *self,
float dx, dy; float dx, dy;
gsk_transform_to_translate (self, &dx, &dy); gsk_transform_to_translate (self, &dx, &dy);
out_rect->origin.x = rect->origin.x + dx; graphene_rect_init (out_rect,
out_rect->origin.y = rect->origin.y + dy; rect->origin.x + dx,
out_rect->size.width = rect->size.width; rect->origin.y + dy,
out_rect->size.height = rect->size.height; rect->size.width,
rect->size.height);
} }
break; break;
@ -1806,10 +1807,11 @@ gsk_transform_transform_bounds (GskTransform *self,
gsk_transform_to_affine (self, &scale_x, &scale_y, &dx, &dy); gsk_transform_to_affine (self, &scale_x, &scale_y, &dx, &dy);
out_rect->origin.x = (rect->origin.x * scale_x) + dx; graphene_rect_init (out_rect,
out_rect->origin.y = (rect->origin.y * scale_y) + dy; (rect->origin.x * scale_x) + dx,
out_rect->size.width = rect->size.width * scale_x; (rect->origin.y * scale_y) + dy,
out_rect->size.height = rect->size.height * scale_y; rect->size.width * scale_x,
rect->size.height * scale_y);
} }
break; break;