callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkStack: Don't mix code and declarations

Browse Source
This commit is contained in:
Matthias Clasen
2015-05-30 09:43:56 -04:00
parent 833dbd65cd
commit f5b245ff04
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkstack.c
View File

@ -2104,10 +2104,12 @@ gtk_stack_size_allocate (GtkWidget *widget,
if (priv->visible_child) if (priv->visible_child)
{ {
int min, nat; int min, nat;
GtkAlign valign;
gtk_widget_get_preferred_height_for_width (priv->visible_child->widget, gtk_widget_get_preferred_height_for_width (priv->visible_child->widget,
allocation->width, allocation->width,
&min, &nat); &min, &nat);
GtkAlign valign = gtk_widget_get_valign (priv->visible_child->widget); valign = gtk_widget_get_valign (priv->visible_child->widget);
child_allocation.height = MAX (nat, allocation->height); child_allocation.height = MAX (nat, allocation->height);
if (valign == GTK_ALIGN_END && if (valign == GTK_ALIGN_END &&
child_allocation.height > allocation->height) child_allocation.height > allocation->height)