summaryrefslogtreecommitdiff
path: root/gtk/gtkgrid.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2011-10-21 16:23:03 -0400
committerMatthias Clasen <mclasen@redhat.com>2011-10-21 16:24:55 -0400
commitbb1d9aba86af715e5a5c53d5ad3b7dfcb720634e (patch)
treefe5d482dc25a9ec4388c3465e36ea6fc77597488 /gtk/gtkgrid.c
parent6b510f485571205a22a646a29bddb992ec6480b3 (diff)
downloadgtk+-bb1d9aba86af715e5a5c53d5ad3b7dfcb720634e.tar.gz
Fix natural/min widht calculations for empty grids
https://bugzilla.gnome.org/show_bug.cgi?id=660139
Diffstat (limited to 'gtk/gtkgrid.c')
-rw-r--r--gtk/gtkgrid.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
index df0c11491b..5ef4a6f794 100644
--- a/gtk/gtkgrid.c
+++ b/gtk/gtkgrid.c
@@ -927,8 +927,13 @@ gtk_grid_request_sum (GtkGridRequest *request,
linedata = &priv->linedata[orientation];
lines = &request->lines[orientation];
- min = (nonempty - 1) * linedata->spacing;
- nat = (nonempty - 1) * linedata->spacing;
+ min = 0;
+ nat = 0;
+ if (nonempty > 0)
+ {
+ min = (nonempty - 1) * linedata->spacing;
+ nat = (nonempty - 1) * linedata->spacing;
+ }
for (i = 0; i < lines->max - lines->min; i++)
{