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

GtkGrid: Undo a size allocation tweak

Browse Source 
Revert 5e1a06d1b1

This change caused empty rows to 'open up', which was not
intended and causes problems as seen in bug 698660.
This commit is contained in:
Matthias Clasen 2013-04-28 18:46:41 -04:00
parent ef759ef19d
commit 13858fde29
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkgrid.c
View File

@ -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;
}