callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iconview: Respect the fixed item width when adjusting the wrap width

Browse Source 
Restore the code the way it was in GTK2.

https://bugzilla.gnome.org/show_bug.cgi?id=680953
This commit is contained in:
Carlos Garcia Campos 2012-09-30 13:09:53 +02:00 committed by Benjamin Otte
parent c8cad49108
commit 247ebbd17c
1 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gtk/gtkiconview.c
View File

@ -1390,16 +1390,42 @@ adjust_wrap_width (GtkIconView *icon_view)
{
if (icon_view->priv->text_cell)
{
gint wrap_width = 50;
gint pixbuf_width, wrap_width;
/* Here we go with the same old guess, try the icon size and set double
* the size of the first icon found in the list, naive but works much
* of the time */
if (icon_view->priv->items && icon_view->priv->pixbuf_cell)
{
gtk_cell_renderer_get_preferred_width (icon_view->priv->pixbuf_cell,
GTK_WIDGET (icon_view),
&wrap_width, NULL);
&pixbuf_width, NULL);
}
else
{
pixbuf_width = 0;
}
if (icon_view->priv->item_width >= 0)
{
if (icon_view->priv->item_orientation == GTK_ORIENTATION_VERTICAL)
{
wrap_width = icon_view->priv->item_width;
}
else
{
wrap_width = icon_view->priv->item_width - pixbuf_width;
}
wrap_width -= 2 * icon_view->priv->item_padding * 2;
}
else
{
wrap_width = MAX (pixbuf_width * 2, 50);
}
if (icon_view->priv->items && icon_view->priv->pixbuf_cell)
{
/* Here we go with the same old guess, try the icon size and set double
* the size of the first icon found in the list, naive but works much
* of the time */
wrap_width = MAX (wrap_width * 2, 50);
}