diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | gtk/gtkiconview.c | 3 |
3 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2005-12-21 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkiconview.c (adjust_wrap_width): Adjust the + wrap-width also if an explicit item width is set. + (#322475, Alex Graveley) + 2005-12-20 Matthias Clasen <mclasen@redhat.com> * gtk/gtkiconview.c (gtk_icon_view_button_press): Reset diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5878d8d2fa..5f3f4bc9ac 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-12-21 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkiconview.c (adjust_wrap_width): Adjust the + wrap-width also if an explicit item width is set. + (#322475, Alex Graveley) + 2005-12-20 Matthias Clasen <mclasen@redhat.com> * gtk/gtkiconview.c (gtk_icon_view_button_press): Reset diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index 3e12cab2bf..0888d04011 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -2580,8 +2580,7 @@ adjust_wrap_width (GtkIconView *icon_view, GtkIconViewCellInfo *pixbuf_info; gint pixbuf_width, wrap_width; - if (icon_view->priv->item_width < 0 && - icon_view->priv->text_cell != -1 && + if (icon_view->priv->text_cell != -1 && icon_view->priv->pixbuf_cell != -1) { text_info = g_list_nth_data (icon_view->priv->cell_list, |