[evolution-patches] #42952 (GAL) second try

[Ettore Perazzoli <ettore ximian com>]

The first fix didn't quite fix it...

-- Ettore

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gal/gal/e-table/ChangeLog,v
retrieving revision 1.900
diff -u -p -r1.900 ChangeLog
--- ChangeLog	19 May 2003 18:37:09 -0000	1.900
+++ ChangeLog	20 May 2003 22:02:16 -0000
@@ -1,3 +1,11 @@
+2003-05-20  Ettore Perazzoli  <ettore ximian com>
+
+	[#42952 again]
+
+	* e-tree.c (tree_canvas_size_allocate): Use
+	e_table_item_get_cell_geometry() instead of
+	e_tree_get_cell_geometry(), since the latter uses the adjustments.
+
 2003-05-19  Mike Kestner  <mkestner ximian com>
 
 	* e-cell-text.c (build_layout): don't call any line breaking
Index: e-tree.c
===================================================================
RCS file: /cvs/gnome/gal/gal/e-table/e-tree.c,v
retrieving revision 1.101
diff -u -p -r1.101 e-tree.c
--- e-tree.c	15 May 2003 20:58:15 -0000	1.101
+++ e-tree.c	20 May 2003 22:02:17 -0000
@@ -776,10 +776,16 @@ tree_canvas_size_allocate (GtkWidget *wi
 		g_source_remove(e_tree->priv->reflow_idle_id);
 	tree_canvas_reflow_idle(e_tree);
 
-	if (path)
-		e_tree_get_cell_geometry (e_tree, e_tree_row_of_node(e_tree, path), 0, &x, &y, &w, &h);
-	else
+	if (path) {
+		int row = e_tree_row_of_node (e_tree, path);
+		int col = 0;
+
+		e_table_item_get_cell_geometry (E_TABLE_ITEM (e_tree->priv->item),
+						&row, &col,
+						&x, &y, &w, &h);
+	} else {
 		y = h = 0;
+	}
 
  	if (y < adj->value || y + h > adj->value + adj->page_size)
 		gtk_adjustment_set_value(adj, CLAMP(y - adj->page_size / 2, adj->lower, adj->upper - adj->page_size));