Commit 13858fde authored by Matthias Clasen's avatar Matthias Clasen

GtkGrid: Undo a size allocation tweak

Revert 5e1a06d1

This change caused empty rows to 'open up', which was not
intended and causes problems as seen in bug 698660.
parent ef759ef1
......@@ -617,18 +617,8 @@ gtk_grid_request_init (GtkGridRequest *request,
child = list->data;
attach = &child->attach[orientation];
if (attach->span != 1)
continue;
if (gtk_widget_compute_expand (child->widget, orientation))
if (attach->span == 1 && gtk_widget_compute_expand (child->widget, orientation))
lines->lines[attach->pos - lines->min].expand = TRUE;
lines->lines[attach->pos - lines->min].empty = FALSE;
}
for (i = 0; i < lines->max - lines->min; i++)
{
if (lines->lines[i].empty)
lines->lines[i].expand = TRUE;
}
}
......@@ -1037,8 +1027,6 @@ gtk_grid_request_compute_expand (GtkGridRequest *request,
if (attach->pos + i >= max || attach->pos + 1 < min)
continue;
if (line->empty)
line->expand = TRUE;
line->empty = FALSE;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment