forked from AuroraMiddleware/gtk
fix wrap width calculations that caused item height to be wrong
Fix by logari81 to the wrap width calculations fir GtkIconView. #490724
This commit is contained in:
parent
2e3866b5b2
commit
6060dab77a
@ -2916,17 +2916,14 @@ adjust_wrap_width (GtkIconView *icon_view,
|
||||
else
|
||||
item_width = item->width;
|
||||
|
||||
if (item->width == -1)
|
||||
{
|
||||
if (item_width > 0)
|
||||
wrap_width = item_width - pixbuf_width - icon_view->priv->spacing;
|
||||
else
|
||||
wrap_width = MAX (2 * pixbuf_width, 50);
|
||||
}
|
||||
else if (icon_view->priv->orientation == GTK_ORIENTATION_VERTICAL)
|
||||
wrap_width = item_width;
|
||||
else
|
||||
wrap_width = item_width - pixbuf_width - icon_view->priv->spacing;
|
||||
if (icon_view->priv->orientation == GTK_ORIENTATION_VERTICAL)
|
||||
wrap_width = item_width;
|
||||
else {
|
||||
if (item->width == -1 && item_width <= 0)
|
||||
wrap_width = MAX (2 * pixbuf_width, 50);
|
||||
else
|
||||
wrap_width = item_width - pixbuf_width - icon_view->priv->spacing;
|
||||
}
|
||||
|
||||
wrap_width -= ITEM_PADDING * 2;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user