[gtk+/combo-refactor] Temporary fix to make separator rows request enough space for the expander size.



commit d178912103c911ed636a85edaf8034dcae248cf4
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Tue Dec 7 13:49:21 2010 +0900

    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

 gtk/gtktreeview.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index d6e290d..c2a611c 100644
--- 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;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]