x should be changed when converting widget <=> bin_window coordinates, not

2007-07-11  Kristian Rietveld  <kris@imendio.com>

	* gtk/gtktreeview.c (gtk_tree_view_*_to_*_coords): x should be
	changed when converting widget <=> bin_window coordinates, not
	when bin_window <=> tree_window.

svn path=/trunk/; revision=18446

diff --git a/ChangeLog b/ChangeLog
index 71197c0ce0be1640d8e17a3025cc10e3e82a3804..7e4377dbe2bdc3b71fa8bfb18d6972c015c12385 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-11  Kristian Rietveld  <kris@imendio.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_*_to_*_coords): x should be
+       changed when converting widget <=> bin_window coordinates, not
+       when bin_window <=> tree_window.
+
 2007-07-11  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtk.symbols:

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index cc440a1190cd1d928c6293c79318a554f5dfe22e..f40aff2dd7b2723b7c69122001a2bea743996975 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -12974,7 +12974,7 @@ gtk_tree_view_convert_widget_to_bin_window_coords (GtkTreeView *tree_view,
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
   if (bx)
-    *bx = wx;
+    *bx = wx + tree_view->priv->hadjustment->value;
   if (by)
     *by = wy - TREE_VIEW_HEADER_HEIGHT (tree_view);
 }
@@ -13002,7 +13002,7 @@ gtk_tree_view_convert_bin_window_to_widget_coords (GtkTreeView *tree_view,
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
   if (wx)
-    *wx = bx;
+    *wx = bx - tree_view->priv->hadjustment->value;
   if (wy)
     *wy = by + TREE_VIEW_HEADER_HEIGHT (tree_view);
 }
@@ -13030,7 +13030,7 @@ gtk_tree_view_convert_tree_to_bin_window_coords (GtkTreeView *tree_view,
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
   if (bx)
-    *bx = tx - tree_view->priv->hadjustment->value;
+    *bx = tx;
   if (by)
     *by = ty - tree_view->priv->dy;
 }
@@ -13058,7 +13058,7 @@ gtk_tree_view_convert_bin_window_to_tree_coords (GtkTreeView *tree_view,
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
   if (tx)
-    *tx = bx + tree_view->priv->hadjustment->value;
+    *tx = bx;
   if (ty)
     *ty = by + tree_view->priv->dy;
 }