fix wrap width calculations that caused item height to be wrong

Fix by logari81 to the wrap width calculations fir GtkIconView. #490724

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index afbc22922258e5ddad0417623a49f7e0ddee5c0f..865b8d56be2f7067a4dc8b64c1b9997bbc993128 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -2916,17 +2916,14 @@ adjust_wrap_width (GtkIconView     *icon_view,
       else
        item_width = item->width;
 
-      if (item->width == -1)
-        {
-         if (item_width > 0)
-           wrap_width = item_width - pixbuf_width - icon_view->priv->spacing;
-         else
-           wrap_width = MAX (2 * pixbuf_width, 50);
-       }
-      else if (icon_view->priv->orientation == GTK_ORIENTATION_VERTICAL)
-       wrap_width = item_width;
-      else
-       wrap_width = item_width - pixbuf_width - icon_view->priv->spacing;
+      if (icon_view->priv->orientation == GTK_ORIENTATION_VERTICAL)
+        wrap_width = item_width;
+      else {
+        if (item->width == -1 && item_width <= 0)
+          wrap_width = MAX (2 * pixbuf_width, 50);
+        else
+          wrap_width = item_width - pixbuf_width - icon_view->priv->spacing;
+        }
 
       wrap_width -= ITEM_PADDING * 2;