Merge branch 'patch-1' into 'master'

GtkWindow: Handle non-square icons with height > width correctly

Closes #657

See merge request GNOME/gtk!170
This commit is contained in:
Matthias Clasen 2018-06-03 18:10:03 +00:00
commit 7a5567bf41

View File

@ -4569,7 +4569,8 @@ icon_from_list (GList *list,
{
texture = list->data;
if (gdk_texture_get_width (texture) <= size)
if (gdk_texture_get_width (texture) <= size &&
gdk_texture_get_height (texture) <= size)
return g_object_ref (texture);
}