forked from AuroraMiddleware/gtk
Add shortcuts for the !children case
Not that we are doing too much work in that case, but we are segfaulting, which is bad. https://bugzilla.gnome.org/show_bug.cgi?id=649972
This commit is contained in:
parent
76a96626fd
commit
b219b3b0ec
@ -1048,6 +1048,15 @@ gtk_grid_get_size (GtkGrid *grid,
|
||||
GtkGridRequest request;
|
||||
GtkGridLines *lines;
|
||||
|
||||
if (minimum)
|
||||
*minimum = 0;
|
||||
|
||||
if (natural)
|
||||
*natural = 0;
|
||||
|
||||
if (grid->priv->children == NULL)
|
||||
return;
|
||||
|
||||
request.grid = grid;
|
||||
gtk_grid_request_count_lines (&request);
|
||||
lines = &request.lines[orientation];
|
||||
@ -1069,6 +1078,15 @@ gtk_grid_get_size_for_size (GtkGrid *grid,
|
||||
GtkGridLines *lines;
|
||||
gint min_size;
|
||||
|
||||
if (minimum)
|
||||
*minimum = 0;
|
||||
|
||||
if (natural)
|
||||
*natural = 0;
|
||||
|
||||
if (grid->priv->children == NULL)
|
||||
return;
|
||||
|
||||
request.grid = grid;
|
||||
gtk_grid_request_count_lines (&request);
|
||||
lines = &request.lines[0];
|
||||
@ -1214,6 +1232,12 @@ gtk_grid_size_allocate (GtkWidget *widget,
|
||||
GtkGridRequest request;
|
||||
GtkGridLines *lines;
|
||||
|
||||
if (priv->children == NULL)
|
||||
{
|
||||
gtk_widget_set_allocation (widget, allocation);
|
||||
return;
|
||||
}
|
||||
|
||||
request.grid = grid;
|
||||
|
||||
gtk_grid_request_count_lines (&request);
|
||||
|
Loading…
Reference in New Issue
Block a user