From 2d5eadb7f99f783970db183dff556df027972229 Mon Sep 17 00:00:00 2001
From: Tristan Van Berkom <tristan.van.berkom@gmail.com>
Date: Sun, 12 Dec 2010 20:59:41 +0900
Subject: [PATCH] Alignments with variable row heights almost works perfectly.

However, I'm going to have to figure a way to store the alignments
for rows separately, this may involve using a separate GtkCellAreaContext
for each row, unfortunately.
---
 gtk/gtkiconview.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 3fa0ba38de..38852a234a 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -2682,8 +2682,6 @@ gtk_icon_view_layout_single_row (GtkIconView *icon_view,
 
       current_width += item->width;
 
-      max_height = MAX (max_height, item->height);
-
       if (items != first_item)
 	{
 	  if ((icon_view->priv->columns <= 0 && current_width > allocation.width) ||
@@ -2691,6 +2689,8 @@ gtk_icon_view_layout_single_row (GtkIconView *icon_view,
 	    break;
 	}
 
+      max_height = MAX (max_height, item->height);
+
       current_width += icon_view->priv->column_spacing;
 
       item->y = *y;