From: Benjamin Otte <otte@redhat.com>
Date: Wed, 13 Jun 2012 02:56:22 +0000 (+0200)
Subject: iconview: Include column spacing in calculation
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~24^2~19748
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7c1b5611940d7540e7b7ebd4cc63b0eee88dac46;p=gtk4.git

iconview: Include column spacing in calculation

The function is probably almost never used, so nobody has ever seen this
bug, but we should still get it right.

https://bugzilla.gnome.org/show_bug.cgi?id=677809
---

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index df40fb6fe9..cdce24cc34 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -1668,8 +1668,8 @@ gtk_icon_view_get_preferred_width_for_height (GtkWidget *widget,
   n_items = gtk_icon_view_get_n_items (icon_view);
 
   gtk_icon_view_get_preferred_item_size (icon_view, GTK_ORIENTATION_HORIZONTAL, row_height, &item_min, &item_nat);
-  *minimum = item_min * ((n_items + rows - 1) / rows);
-  *natural = item_nat * ((n_items + rows - 1) / rows);
+  *minimum = (item_min + priv->column_spacing) * ((n_items + rows - 1) / rows) - priv->column_spacing;
+  *natural = (item_nat + priv->column_spacing) * ((n_items + rows - 1) / rows) - priv->column_spacing;
 
   *minimum += 2 * priv->margin;
   *natural += 2 * priv->margin;