Merge branch 'gtk-3-24' into 'gtk-3-24'

GtkWindow: Handle non-square icons with height > width correctly See merge request GNOME/gtk!173
2018-06-03 23:21:33 +00:00
parent 7951f0e9a9 d4feb8929e
commit 83159ffabf
1 changed files with 2 additions and 1 deletions
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4576,7 +4576,8 @@ icon_from_list (GList *list,
  for (l = list; l; l = l->next)
    {
      pixbuf = list->data;
-      if (gdk_pixbuf_get_width (pixbuf) <= size)
+      if (gdk_pixbuf_get_width (pixbuf) <= size &&
+          gdk_pixbuf_get_height (pixbuf) <= size)
        {
          best = g_object_ref (pixbuf);
          break;