Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkCssImageScaled: Ensure we compute the child when computing the image

Browse Source
This commit is contained in:
Alexander Larsson
2013-06-28 00:22:00 +02:00
parent 681a6ad229
commit cdabe7db91
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gtk/gtkcssimagescaled.c
View File

@@ -103,7 +103,7 @@ gtk_css_image_scaled_compute (GtkCssImage *image,
GtkCssImageScaled *copy;
int i;
scale = MIN (scale, scaled->n_images);
scale = MAX(MIN (scale, scaled->n_images), 1);
if (scaled->scale == scale)
return g_object_ref (scaled);
@@ -112,9 +112,20 @@ gtk_css_image_scaled_compute (GtkCssImage *image,
copy = g_object_new (_gtk_css_image_scaled_get_type (), NULL);
copy->scale = scale;
copy->n_images = scaled->n_images;
copy->images = g_memdup (scaled->images, sizeof (GtkCssImage *) * scaled->n_images);
copy->images = g_new (GtkCssImage *, scaled->n_images);
for (i = 0; i < scaled->n_images; i++)
g_object_ref (copy->images[i]);
{
if (i == scale - 1)
copy->images[i] = _gtk_css_image_compute (scaled->images[i],
property_id,
provider,
scale,
values,
parent_values,
dependencies);
else
copy->images[i] = g_object_ref (scaled->images[i]);
}
return GTK_CSS_IMAGE (copy);
}