AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

widget: Clean up gtk_widget_compute_transform()

Browse Source 
The code was all over the place and being clear here is very useful.
This commit is contained in:
Benjamin Otte 2019-02-20 03:46:28 +01:00
parent 93b47c12d7
commit 8222631d63
1 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gtk/gtkwidget.c
View File

@ -11252,51 +11252,35 @@ gtk_widget_compute_transform (GtkWidget *widget,
GtkWidget *target,
graphene_matrix_t *out_transform)
{
GtkWidget *parent;
GtkWidget *ancestor;
graphene_matrix_t transform;
GtkWidget *ancestor, *iter;
graphene_matrix_t transform, inverse;
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
g_return_val_if_fail (GTK_IS_WIDGET (target), FALSE);
g_return_val_if_fail (out_transform != NULL, FALSE);
ancestor = gtk_widget_common_ancestor (widget, target);
if (!ancestor)
if (ancestor == NULL)
return FALSE;
graphene_matrix_init_identity (&transform);
parent = widget;
while (parent != ancestor)
for (iter = widget; iter != ancestor; iter = iter->priv->parent)
{
GtkWidgetPrivate *priv = gtk_widget_get_instance_private (parent);
GtkWidgetPrivate *priv = gtk_widget_get_instance_private (iter);
graphene_matrix_multiply (&transform, &priv->transform, &transform);
parent = priv->parent;
}
g_assert (parent == ancestor);
graphene_matrix_init_identity (&inverse);
for (iter = target; iter != ancestor; iter = iter->priv->parent)
{
GtkWidgetPrivate *priv = gtk_widget_get_instance_private (iter);
{
graphene_matrix_t down_transform;
graphene_matrix_t inv;
graphene_matrix_multiply (&inverse, &priv->transform, &inverse);
}
graphene_matrix_inverse (&inverse, &inverse);
graphene_matrix_init_identity (&down_transform);
parent = target;
while (parent != ancestor)
{
graphene_matrix_multiply (&down_transform, &parent->priv->transform, &down_transform);
parent = parent->priv->parent;
}
graphene_matrix_inverse (&down_transform, &inv);
graphene_matrix_multiply (&transform, &inv, &transform);
}
*out_transform = transform;
graphene_matrix_multiply (&transform, &inverse, out_transform);
return TRUE;
}