AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 515af9ce70.
This commit is contained in:
Tristan Van Berkom 2010-12-07 14:09:26 +09:00
parent 515af9ce70
commit 1b33698384
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtktreeview.c
View File

@ -6148,6 +6148,7 @@ validate_row (GtkTreeView *tree_view,
{ {
row_height += vertical_separator; row_height += vertical_separator;
height = MAX (height, row_height); height = MAX (height, row_height);
height = MAX (height, tree_view->priv->expander_size);
} }
else else
{ {
@ -6157,10 +6158,6 @@ validate_row (GtkTreeView *tree_view,
height = 2 + 2 * focus_pad; 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)) if (gtk_tree_view_is_expander_column (tree_view, column))
{ {
padding += horizontal_separator + (depth - 1) * tree_view->priv->level_indentation; padding += horizontal_separator + (depth - 1) * tree_view->priv->level_indentation;