AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

iconview: Don't shrink items

Browse Source 
The previous code assumed that the width was always enough for more than
one column, which is obviously not correct when a number of columns is
hardcoded.

With this patch, it will now always check that the width is enough and
otherwise cause scrolling.

https://bugzilla.gnome.org/show_bug.cgi?id=677809
This commit is contained in:
Benjamin Otte 2012-06-10 16:28:47 +02:00
parent ad63d1b59e
commit ec755541ab
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkiconview.c
View File

@ -2868,16 +2868,9 @@ gtk_icon_view_layout (GtkIconView *icon_view)
&n_columns, &item_width);
n_rows = (n_items + n_columns - 1) / n_columns;
if (n_columns <= 1)
{
/* We might need vertical scrolling here */
int min_width = item_width + 2 * priv->item_padding + 2 * priv->margin;
priv->width = MAX (min_width, gtk_widget_get_allocated_width (widget));
}
else
{
priv->width = gtk_widget_get_allocated_width (widget);
}
priv->width = n_columns * (item_width + 2 * priv->item_padding + priv->column_spacing) - priv->column_spacing;
priv->width += 2 * priv->margin;
priv->width = MAX (priv->width, gtk_widget_get_allocated_width (widget));
/* Clear the per row contexts */
g_ptr_array_set_size (icon_view->priv->row_contexts, 0);