diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2018-06-03 23:21:33 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2018-06-03 23:21:33 +0000 |
| commit | 83159ffabf3bd9f1e4fa2522d3735ebc3e1e2124 (patch) | |
| tree | 20db47436c51443f5a731cb13e3ecead02a11f22 | |
| parent | 7951f0e9a9afbfdbd7b3b5437b718cfa5f945240 (diff) | |
| parent | d4feb8929ed40f1331060825611599723d2ab3ea (diff) | |
| download | gtk+-83159ffabf3bd9f1e4fa2522d3735ebc3e1e2124.tar.gz | |
Merge branch 'gtk-3-24' into 'gtk-3-24'
GtkWindow: Handle non-square icons with height > width correctly
See merge request GNOME/gtk!173
| -rw-r--r-- | gtk/gtkwindow.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index c6aa5425ff..b5f4b5af3d 100644 --- 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; |