mirror of
https://github.com/brl/mutter.git
synced 2024-12-23 19:42:05 +00:00
table-layout: Fix column visibility for spanning actors
Ported to ClutterTableLayout from MxTable:
6633f185fc
https://bugzilla.gnome.org/show_bug.cgi?id=672557
This commit is contained in:
parent
67ddf8745b
commit
16d28853fa
@ -821,7 +821,6 @@ calculate_col_widths (ClutterTableLayout *self,
|
||||
child = clutter_actor_get_next_sibling (child))
|
||||
{
|
||||
ClutterTableChild *meta;
|
||||
DimensionData *col;
|
||||
gfloat c_min, c_pref;
|
||||
gfloat min_width, pref_width;
|
||||
gint start_col, end_col;
|
||||
@ -838,7 +837,6 @@ calculate_col_widths (ClutterTableLayout *self,
|
||||
if (meta->col_span < 2)
|
||||
continue;
|
||||
|
||||
col = &columns[meta->col];
|
||||
start_col = meta->col;
|
||||
end_col = meta->col + meta->col_span - 1;
|
||||
|
||||
@ -856,9 +854,9 @@ calculate_col_widths (ClutterTableLayout *self,
|
||||
if (columns[i].expand)
|
||||
n_expand++;
|
||||
|
||||
if (!col->visible)
|
||||
if (!columns[i].visible)
|
||||
{
|
||||
col->visible = TRUE;
|
||||
columns[i].visible = TRUE;
|
||||
priv->visible_cols += 1;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user