Adjust the wrap-width also if an explicit item width is set. (#322475,

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)

diff --git a/ChangeLog b/ChangeLog
index 5878d8d2faf580c63dddca38e45edc37421ef7aa..5f3f4bc9acd0541bcac2ff6e5510ba226217e793 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 5878d8d2faf580c63dddca38e45edc37421ef7aa..5f3f4bc9acd0541bcac2ff6e5510ba226217e793 100644 (file)
--- 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 3e12cab2bf85f1d61f39c1bc2a631e596a05a954..0888d04011c8c29fda6f5e9e97c42818441fc808 100644 (file)
--- 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,