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

Support aspect=TRUE in _gdk_pixbuf_new_from_stream_at_scale

Browse Source 
The icon theme test failed without this, and we *should* handle
it if we're accepting the argument.
This commit is contained in:
Alexander Larsson 2020-02-05 17:44:47 +01:00
parent b529f77827
commit adccd1391e
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gtk/tools/gdkpixbufutils.c
View File

@ -126,7 +126,28 @@ size_prepared_cb2 (GdkPixbufLoader *loader,
{
int *scales = data;
gdk_pixbuf_loader_set_size (loader, scales[0], scales[1]);
if (scales[2]) /* keep same aspect ratio as original, while fitting in given size */
{
double aspect = (double) height / width;
/* First use given width and calculate size */
width = scales[0];
height = scales[0] * aspect;
/* Check if it fits given height, otherwise scale down */
if (height > scales[1])
{
width *= (double) scales[1] / height;
height = scales[1];
}
}
else
{
width = scales[0];
height = scales[1];
}
gdk_pixbuf_loader_set_size (loader, width, scales[1]);
}
GdkPixbuf *
@ -140,7 +161,7 @@ _gdk_pixbuf_new_from_stream_at_scale (GInputStream *stream,
{
GdkPixbufLoader *loader;
GdkPixbuf *pixbuf;
int scales[2];
int scales[3];
if (format)
{
@ -153,6 +174,7 @@ _gdk_pixbuf_new_from_stream_at_scale (GInputStream *stream,
scales[0] = width;
scales[1] = height;
scales[2] = aspect;
g_signal_connect (loader, "size-prepared",
G_CALLBACK (size_prepared_cb2), scales);