From 16d28853facdfb81e90a9ac33ae9419bacefd26e Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 21 Mar 2012 09:36:07 -0400 Subject: [PATCH] table-layout: Fix column visibility for spanning actors Ported to ClutterTableLayout from MxTable: https://github.com/clutter-project/mx/commit/6633f185fcfb7ce8a6ef85276d09e4ee92f584b8 https://bugzilla.gnome.org/show_bug.cgi?id=672557 --- clutter/clutter-table-layout.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/clutter/clutter-table-layout.c b/clutter/clutter-table-layout.c index 505351a18..f4278bf3b 100644 --- a/clutter/clutter-table-layout.c +++ b/clutter/clutter-table-layout.c @@ -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; } }