brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

table-layout: Fix [xy]_expand

Browse Source 
A copy and paste thinko.

https://bugzilla.gnome.org/show_bug.cgi?id=672853
This commit is contained in:
Emmanuele Bassi 2012-03-28 08:34:36 +01:00 committed by Emmanuele Bassi
parent 628ffa7b91
commit 3c1358da5d
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clutter/clutter-table-layout.c
View File

@ -861,7 +861,7 @@ calculate_col_widths (ClutterTableLayout *self,
}
if (!columns[i].expand)
columns[i].expand = meta->x_fill;
columns[i].expand = meta->x_expand;
}
min_width += priv->col_spacing * (meta->col_span - 1);
pref_width += priv->col_spacing * (meta->col_span - 1);
@ -915,8 +915,6 @@ calculate_col_widths (ClutterTableLayout *self,
}
}
}
}
/* calculate final widths */
@ -1135,7 +1133,7 @@ calculate_row_heights (ClutterTableLayout *self,
}
if (!rows[i].expand)
rows[i].expand = meta->y_fill;
rows[i].expand = meta->y_expand;
}
min_height += priv->row_spacing * (meta->row_span - 1);
@ -1200,7 +1198,6 @@ calculate_row_heights (ClutterTableLayout *self,
}
}
}
}
/* calculate final heights */