isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-30 03:50:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

table-layout: Fix x/y-expand for spanning actors

Browse Source 
Ported to ClutterTableLayout from MxTable:

239e53146a

https://bugzilla.gnome.org/show_bug.cgi?id=672557
This commit is contained in:
Jasper St. Pierre 2012-03-21 10:36:42 -04:00
parent 16d28853fa
commit 8c0be4181b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -859,6 +859,9 @@ calculate_col_widths (ClutterTableLayout *self,
columns[i].visible = TRUE; columns[i].visible = TRUE;
priv->visible_cols += 1; priv->visible_cols += 1;
} }
if (!columns[i].expand)
columns[i].expand = meta->x_fill;
} }
min_width += priv->col_spacing * (meta->col_span - 1); min_width += priv->col_spacing * (meta->col_span - 1);
pref_width += priv->col_spacing * (meta->col_span - 1); pref_width += priv->col_spacing * (meta->col_span - 1);
@ -1134,6 +1137,9 @@ calculate_row_heights (ClutterTableLayout *self,
rows[i].visible = TRUE; rows[i].visible = TRUE;
priv->visible_rows += 1; priv->visible_rows += 1;
} }
if (!rows[i].expand)
rows[i].expand = meta->y_fill;
} }
min_height += priv->row_spacing * (meta->row_span - 1); min_height += priv->row_spacing * (meta->row_span - 1);