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).

diff --git a/ChangeLog b/ChangeLog
index 273edbf0981878471d91bddc6d2766443d4615d9..6b2a11f3866764ddf0bb429e4dd3694fc22092e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 273edbf0981878471d91bddc6d2766443d4615d9..6b2a11f3866764ddf0bb429e4dd3694fc22092e2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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):

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index b5e657e0aadbbc8b2b2c5d78f5a1fa6dedb5c473..3ee3fcc47513efbbcdc6919e2d9771964c9f24ad 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -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;