take the cell spacing into account when calculating the available extra

2006-08-16  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
	take the cell spacing into account when calculating the available
	extra space. (#350938, patch from Peter Johanson).
This commit is contained in:
Kristian Rietveld 2006-08-16 15:58:28 +00:00 committed by Kristian Rietveld
parent 6031107de2
commit b82aa4bbee
3 changed files with 18 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2006-08-16 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
take the cell spacing into account when calculating the available
extra space. (#350938, patch from Peter Johanson).
2006-08-16 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_fetch_child):

View File

@ -1,3 +1,9 @@
2006-08-16 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
take the cell spacing into account when calculating the available
extra space. (#350938, patch from Peter Johanson).
2006-08-16 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_fetch_child):

View File

@ -2631,6 +2631,7 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
gint special_cells;
gint horizontal_separator;
gboolean cursor_row = FALSE;
gboolean first_cell = TRUE;
gboolean rtl;
/* If we have rtl text, we need to transform our areas */
GdkRectangle rtl_cell_area;
@ -2699,7 +2700,11 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
if (info->expand == TRUE)
expand_cell_count ++;
full_requested_width += info->requested_width;
/* FIXME: We prolly need to include tree_column->spacing here */
if (!first_cell)
full_requested_width += tree_column->spacing;
first_cell = FALSE;
}
extra_space = cell_area->width - full_requested_width;