[gtk+] render: Compute extents correctly
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] render: Compute extents correctly
- Date: Sat, 19 Nov 2016 02:16:37 +0000 (UTC)
commit dc634fe6db2e10b43f65cf9da499470d9ac0a64f
Author: Benjamin Otte <otte redhat com>
Date: Sat Nov 19 03:15:51 2016 +0100
render: Compute extents correctly
I multiplied matrices the wrong way. Again.
gtk/gtkrendericon.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkrendericon.c b/gtk/gtkrendericon.c
index 84c7a67..a850627 100644
--- a/gtk/gtkrendericon.c
+++ b/gtk/gtkrendericon.c
@@ -229,7 +229,7 @@ gtk_css_style_render_icon_get_extents (GtkCssStyle *style,
return;
graphene_matrix_init_translate (&translate_matrix, &(graphene_point3d_t)GRAPHENE_POINT3D_INIT(x + width /
2.0, y + height / 2.0, 0));
- graphene_matrix_multiply (&translate_matrix, &transform_matrix, &matrix);
+ graphene_matrix_multiply (&transform_matrix, &translate_matrix, &matrix);
graphene_rect_init (&bounds,
- width / 2.0, - height / 2.0,
width, height);
@@ -240,8 +240,8 @@ gtk_css_style_render_icon_get_extents (GtkCssStyle *style,
extents->x = floorf (bounds.origin.x) - border.left;
extents->y = floorf (bounds.origin.y) - border.top;
- extents->width = ceilf (bounds.origin.x + bounds.size.width) - extents->x + border.left + border.right;
- extents->height = ceilf (bounds.origin.y + bounds.size.height) - extents->y + border.top + border.bottom;
+ extents->width = ceilf (bounds.origin.x + bounds.size.width) - extents->x + border.right;
+ extents->height = ceilf (bounds.origin.y + bounds.size.height) - extents->y + border.bottom;
}
void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]