Fix row_spacing/column_spacing confusion. (#330732, Donald Straney)

2006-02-10  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkiconview.c (gtk_icon_view_get_item_at_coords): Fix
        row_spacing/column_spacing confusion.  (#330732, Donald Straney)

diff --git a/ChangeLog b/ChangeLog
index 7c7d107c168a8efb2e0e877934ed36be76658208..e26c92350b2702f7da080c181bafd0ca834ab510 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-10  Matthias Clasen  <mclasen@redhat.com>
+       
+       * gtk/gtkiconview.c (gtk_icon_view_get_item_at_coords): Fix
+       row_spacing/column_spacing confusion.  (#330732, Donald Straney)
+
 2006-02-10  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkstyle.c: Add some docs. (#330073, Mart Raudsepp)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7c7d107c168a8efb2e0e877934ed36be76658208..e26c92350b2702f7da080c181bafd0ca834ab510 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-02-10  Matthias Clasen  <mclasen@redhat.com>
+       
+       * gtk/gtkiconview.c (gtk_icon_view_get_item_at_coords): Fix
+       row_spacing/column_spacing confusion.  (#330732, Donald Straney)
+
 2006-02-10  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkstyle.c: Add some docs. (#330073, Mart Raudsepp)

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 0888d04011c8c29fda6f5e9e97c42818441fc808..05bec7202bf067fe003e951543b4363757a7e232 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -3101,8 +3101,8 @@ gtk_icon_view_get_item_at_coords (GtkIconView          *icon_view,
     {
       GtkIconViewItem *item = items->data;
 
-      if (x >= item->x - icon_view->priv->row_spacing/2 && x <= item->x + item->width + icon_view->priv->row_spacing/2 &&
-         y >= item->y - icon_view->priv->column_spacing/2 && y <= item->y + item->height + icon_view->priv->column_spacing/2)
+      if (x >= item->x - icon_view->priv->column_spacing/2 && x <= item->x + item->width + icon_view->priv->column_spacing/2 &&
+         y >= item->y - icon_view->priv->row_spacing/2 && y <= item->y + item->height + icon_view->priv->row_spacing/2)
        {
          if (only_in_cell || cell_at_pos)
            {