Temporary fix to make separator rows request enough space for the expander size.

This fix is incorrect, treeviews dont rely on the expander size for drawing
separator rows (added XXX comment in line), need to fix this somewhere else

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index d6e290dff95c6ad14f3dfbe592fe1b40900fd777..c2a611ccd58abb9848c7049826b7968dbbe28a94 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -6148,7 +6148,6 @@ validate_row (GtkTreeView *tree_view,
        {
           row_height += vertical_separator;
          height = MAX (height, row_height);
-         height = MAX (height, tree_view->priv->expander_size);
        }
       else
         {
@@ -6158,6 +6157,10 @@ validate_row (GtkTreeView *tree_view,
             height = 2 + 2 * focus_pad;
         }
 
+      /* XXX Expander size is also used to draw the separator rows, 
+       * maybe that should not be the case ? */
+      height = MAX (height, tree_view->priv->expander_size);
+
       if (gtk_tree_view_is_expander_column (tree_view, column))
         {
          padding += horizontal_separator + (depth - 1) * tree_view->priv->level_indentation;