[gtk+] iconview: clamp item size to be in [minimum, natural]

[Benjamin Otte <otte src gnome org>]

commit 6d9d87806ad957bfabebd18989c8989efce19c01
Author: Benjamin Otte <otte redhat com>
Date:   Wed Jun 13 19:26:09 2012 +0200

    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 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index cdce24c..63f67a5 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -1598,7 +1598,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;
     }
@@ -1606,7 +1606,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;
     }