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)
This commit is contained in:
Matthias Clasen
2005-12-21 18:14:59 +00:00
committed by Matthias Clasen
parent 5578b91968
commit 95d8688bf3
3 changed files with 13 additions and 2 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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,