Merge from HEAD.

Thu Jan 30 23:48:30 2003  Kristian Rietveld  <kris@gtk.org>

        Merge from HEAD.

        * gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_count_special_cell):
        only count the special cell if it is also visible,
        (_gtk_tree_view_column_get_neighbor_sizes): only take the width into
        account from visible cells,
        (gtk_tree_view_column_cell_get_position): likewise, (Reported and
        testcase provided by Vasco Alexandre da Silva Costa, via IRC,
        tracking bug was #104563).

Thu Jan 30 23:46:15 2003  Kristian Rietveld  <kris@gtk.org>

        Merge from HEAD.

        * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
        subtract expander space and focus line space from the extra space
        we are about the allocate. (Fixes #104635).

Thu Jan 30 23:42:03 2003  Kristian Rietveld  <kris@gtk.org>

        Merge from HEAD.

        * gtk/gtkstyle.c (apply_affine_on_point): fix rouding error
        (Fixes #96252, patch from Soeren Sandmann).

7 files changed, 148 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 2aab6c2a4..c9e90b5aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+Thu Jan 30 23:48:30 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_count_special_cell):
+	only count the special cell if it is also visible,
+	(_gtk_tree_view_column_get_neighbor_sizes): only take the width into
+	account from visible cells,
+	(gtk_tree_view_column_cell_get_position): likewise, (Reported and
+	testcase provided by Vasco Alexandre da Silva Costa, via IRC,
+	tracking bug was #104563).
+	
+Thu Jan 30 23:46:15 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
+	subtract expander space and focus line space from the extra space
+	we are about the allocate. (Fixes #104635).
+
+Thu Jan 30 23:42:03 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtkstyle.c (apply_affine_on_point): fix rouding error
+	(Fixes #96252, patch from Soeren Sandmann).
+
 Thu Jan 30 16:54:29 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtknotebook.c: Patch from Soeren Sandmann
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2aab6c2a4..c9e90b5aa 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,30 @@
+Thu Jan 30 23:48:30 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_count_special_cell):
+	only count the special cell if it is also visible,
+	(_gtk_tree_view_column_get_neighbor_sizes): only take the width into
+	account from visible cells,
+	(gtk_tree_view_column_cell_get_position): likewise, (Reported and
+	testcase provided by Vasco Alexandre da Silva Costa, via IRC,
+	tracking bug was #104563).
+	
+Thu Jan 30 23:46:15 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
+	subtract expander space and focus line space from the extra space
+	we are about the allocate. (Fixes #104635).
+
+Thu Jan 30 23:42:03 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtkstyle.c (apply_affine_on_point): fix rouding error
+	(Fixes #96252, patch from Soeren Sandmann).
+
 Thu Jan 30 16:54:29 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtknotebook.c: Patch from Soeren Sandmann
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2aab6c2a4..c9e90b5aa 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,30 @@
+Thu Jan 30 23:48:30 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_count_special_cell):
+	only count the special cell if it is also visible,
+	(_gtk_tree_view_column_get_neighbor_sizes): only take the width into
+	account from visible cells,
+	(gtk_tree_view_column_cell_get_position): likewise, (Reported and
+	testcase provided by Vasco Alexandre da Silva Costa, via IRC,
+	tracking bug was #104563).
+	
+Thu Jan 30 23:46:15 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
+	subtract expander space and focus line space from the extra space
+	we are about the allocate. (Fixes #104635).
+
+Thu Jan 30 23:42:03 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtkstyle.c (apply_affine_on_point): fix rouding error
+	(Fixes #96252, patch from Soeren Sandmann).
+
 Thu Jan 30 16:54:29 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtknotebook.c: Patch from Soeren Sandmann
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2aab6c2a4..c9e90b5aa 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,30 @@
+Thu Jan 30 23:48:30 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_count_special_cell):
+	only count the special cell if it is also visible,
+	(_gtk_tree_view_column_get_neighbor_sizes): only take the width into
+	account from visible cells,
+	(gtk_tree_view_column_cell_get_position): likewise, (Reported and
+	testcase provided by Vasco Alexandre da Silva Costa, via IRC,
+	tracking bug was #104563).
+	
+Thu Jan 30 23:46:15 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
+	subtract expander space and focus line space from the extra space
+	we are about the allocate. (Fixes #104635).
+
+Thu Jan 30 23:42:03 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtkstyle.c (apply_affine_on_point): fix rouding error
+	(Fixes #96252, patch from Soeren Sandmann).
+
 Thu Jan 30 16:54:29 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtknotebook.c: Patch from Soeren Sandmann
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2aab6c2a4..c9e90b5aa 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,30 @@
+Thu Jan 30 23:48:30 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_count_special_cell):
+	only count the special cell if it is also visible,
+	(_gtk_tree_view_column_get_neighbor_sizes): only take the width into
+	account from visible cells,
+	(gtk_tree_view_column_cell_get_position): likewise, (Reported and
+	testcase provided by Vasco Alexandre da Silva Costa, via IRC,
+	tracking bug was #104563).
+	
+Thu Jan 30 23:46:15 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
+	subtract expander space and focus line space from the extra space
+	we are about the allocate. (Fixes #104635).
+
+Thu Jan 30 23:42:03 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from HEAD.
+
+	* gtk/gtkstyle.c (apply_affine_on_point): fix rouding error
+	(Fixes #96252, patch from Soeren Sandmann).
+
 Thu Jan 30 16:54:29 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtknotebook.c: Patch from Soeren Sandmann
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index fe0198af4..1793c6bbf 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -4694,8 +4694,8 @@ apply_affine_on_point (double affine[6], GdkPoint *point)
   x = point->x * affine[0] + point->y * affine[2] + affine[4];
   y = point->x * affine[1] + point->y * affine[3] + affine[5];
 
-  point->x = x;
-  point->y = y;
+  point->x = floor (x);
+  point->y = floor (y);
 }
 
 static void
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 423b77e68..278b6b8a9 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -1103,8 +1103,9 @@ _gtk_tree_view_column_count_special_cells (GtkTreeViewColumn *column)
     {
       GtkTreeViewColumnCellInfo *cellinfo = list->data;
 
-      if (cellinfo->cell->mode == GTK_CELL_RENDERER_MODE_EDITABLE ||
-	  cellinfo->cell->mode == GTK_CELL_RENDERER_MODE_ACTIVATABLE)
+      if ((cellinfo->cell->mode == GTK_CELL_RENDERER_MODE_EDITABLE ||
+	  cellinfo->cell->mode == GTK_CELL_RENDERER_MODE_ACTIVATABLE) &&
+	  cellinfo->cell->visible)
 	i++;
     }
 
@@ -2468,7 +2469,7 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn  *tree_column,
       full_requested_width += info->requested_width;
     }
 
-  extra_space = background_area->width - full_requested_width;
+  extra_space = background_area->width - full_requested_width - dx;
   if (extra_space < 0)
     extra_space = 0;
   else if (extra_space > 0 && expand_cell_count > 0)
@@ -3256,7 +3257,8 @@ _gtk_tree_view_column_get_neighbor_sizes (GtkTreeViewColumn *column,
 	  if (info->cell == cell)
 	    break;
 
-	  *left += info->real_width;
+	  if (info->cell->visible)
+	    *left += info->real_width;
 	}
     }
 
@@ -3286,7 +3288,8 @@ _gtk_tree_view_column_get_neighbor_sizes (GtkTreeViewColumn *column,
 	      GtkTreeViewColumnCellInfo *info =
 	        (GtkTreeViewColumnCellInfo *)list->data;
 
-	      *right += info->real_width;
+	      if (info->cell->visible)
+	        *right += info->real_width;
 	    }
 	}
     }
@@ -3312,7 +3315,9 @@ gtk_tree_view_column_cell_get_position (GtkTreeViewColumn *tree_column,
           found_cell = TRUE;
           break;
         }
-      current_x += cellinfo->real_width;
+
+      if (cellinfo->cell->visible)
+        current_x += cellinfo->real_width;
     }
 
   if (found_cell)