[gtk+/treeview-refactor] Available extra space could be less than zero
- From: Kristian Rietveld <kristian src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/treeview-refactor] Available extra space could be less than zero
- Date: Sun, 28 Nov 2010 20:15:10 +0000 (UTC)
commit 354b3412ddcdd73cd1bc9f2bc23a805d67e7fbf5
Author: Kristian Rietveld <kris gtk org>
Date: Sun Nov 14 10:43:00 2010 +0100
Available extra space could be less than zero
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.
gtk/gtkcellareabox.c | 15 ++++++++++++---
gtk/gtkcellareaboxcontext.c | 5 ++++-
2 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkcellareabox.c b/gtk/gtkcellareabox.c
index c29e260..99b5b41 100644
--- a/gtk/gtkcellareabox.c
+++ b/gtk/gtkcellareabox.c
@@ -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)
diff --git a/gtk/gtkcellareaboxcontext.c b/gtk/gtkcellareaboxcontext.c
index 19fd36e..d475549 100644
--- a/gtk/gtkcellareaboxcontext.c
+++ b/gtk/gtkcellareaboxcontext.c
@@ -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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]