From 29da4cf2956f84a95c4d293fb4bd4864e36bc244 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 13 Jun 2012 19:26:09 +0200 Subject: [PATCH] iconview: clamp item size to be in [minimum, natural] Minimum size is necessary so you can see the item. If we can't get that we need to scroll. Natural as the maximum is used so that the spacing between items doesn't increase when resizing the iconview, but empty space is added to the right/bottom instead. https://bugzilla.gnome.org/show_bug.cgi?id=677809 --- gtk/gtkiconview.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index f5ddf2ba7c..cb74190b1a 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -1605,7 +1605,7 @@ gtk_icon_view_compute_n_items_for_size (GtkIconView *icon_view, if (min_item_size) { *min_item_size = size / *min_items; - *min_item_size = MIN (*min_item_size, natural); + *min_item_size = CLAMP (*min_item_size, minimum, natural); *min_item_size -= spacing; *min_item_size -= 2 * priv->item_padding; } @@ -1613,7 +1613,7 @@ gtk_icon_view_compute_n_items_for_size (GtkIconView *icon_view, if (max_item_size) { *max_item_size = size / *max_items; - *max_item_size = MIN (*max_item_size, natural); + *max_item_size = CLAMP (*max_item_size, minimum, natural); *max_item_size -= spacing; *max_item_size -= 2 * priv->item_padding; }