iconview: Fix negative natural size request on empty iconview

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index c891509f2f1197d31976f951cb989e76fb363a42..6670098924a99d529edaf1f89c1063285487d544 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -1543,8 +1543,16 @@ gtk_icon_view_get_preferred_width (GtkWidget *widget,
     {
       int n_items = gtk_icon_view_get_n_items (icon_view);
 
-      *minimum = n_items ? item_min : 0;
-      *natural = item_nat * n_items + priv->column_spacing * (n_items - 1);
+      if (n_items == 0)
+        {
+          *minimum = 0;
+          *natural = 0;
+        }
+      else
+        {
+          *minimum = item_min;
+          *natural = item_nat * n_items + priv->column_spacing * (n_items - 1);
+        }
     }
 
   *minimum += 2 * priv->margin;
@@ -1595,8 +1603,16 @@ gtk_icon_view_get_preferred_height (GtkWidget *widget,
     }
   else
     {
-      *minimum = n_items ? item_min : 0;
-      *natural = item_nat * n_items + priv->row_spacing * (n_items - 1);
+      if (n_items == 0)
+        {
+          *minimum = 0;
+          *natural = 0;
+        }
+      else
+        {
+          *minimum = item_min;
+          *natural = item_nat * n_items + priv->row_spacing * (n_items - 1);
+        }
     }
 
   *minimum += 2 * priv->margin;