Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Available extra space could be less than zero

Browse Source 
The allocated size, or (horizontally speaking) for-width size, can be
smaller than the sum of all minimum widths.  For example when the user
is resizing tree view columns manually.
This commit is contained in:
Kristian Rietveld
2010-11-14 10:43:00 +01:00
parent 5df7dab3cf
commit 354b3412dd
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkcellareabox.c
View File

@@ -770,7 +770,10 @@ get_allocated_cells (GtkCellAreaBox *box,
/* Distribute cells naturally within the group */
avail_size -= (visible_cells - 1) * priv->spacing;
avail_size = gtk_distribute_natural_allocation (avail_size, visible_cells, sizes);
if (avail_size > 0)
avail_size = gtk_distribute_natural_allocation (avail_size, visible_cells, sizes);
else
avail_size = 0;
/* Calculate/distribute expand for cells */
if (expand_cells > 0)
@@ -1535,7 +1538,10 @@ compute_group_size_for_opposing_orientation (GtkCellAreaBox *box,
for (i = 0; i < n_sizes; i++)
avail_size -= orientation_sizes[i].minimum_size;
avail_size = gtk_distribute_natural_allocation (avail_size, n_sizes, orientation_sizes);
if (avail_size > 0)
avail_size = gtk_distribute_natural_allocation (avail_size, n_sizes, orientation_sizes);
else
avail_size = 0;
/* Calculate/distribute expand for cells */
if (group->expand_cells > 0)
@@ -1607,7 +1613,10 @@ compute_size_for_opposing_orientation (GtkCellAreaBox *box,
for (i = 0; i < n_groups; i++)
avail_size -= orientation_sizes[i].minimum_size;
avail_size = gtk_distribute_natural_allocation (avail_size, n_groups, orientation_sizes);
if (avail_size > 0)
avail_size = gtk_distribute_natural_allocation (avail_size, n_groups, orientation_sizes);
else
avail_size = 0;
/* Calculate/distribute expand for groups */
if (n_expand_groups > 0)

5
gtk/gtkcellareaboxcontext.c
View File

@@ -412,7 +412,10 @@ allocate_for_orientation (GtkCellAreaBoxContext *context,
for (i = 0; i < n_groups; i++)
avail_size -= sizes[i].minimum_size;
avail_size = gtk_distribute_natural_allocation (avail_size, n_groups, sizes);
if (avail_size > 0)
avail_size = gtk_distribute_natural_allocation (avail_size, n_groups, sizes);
else
avail_size = 0;
/* Calculate/distribute expand for groups */
if (n_expand_groups > 0)