isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 12:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

table-layout: Fix column visibility for spanning actors

Browse Source 
Ported to ClutterTableLayout from MxTable:

6633f185fc

https://bugzilla.gnome.org/show_bug.cgi?id=672557
This commit is contained in:
Jasper St. Pierre 2012-03-21 09:36:07 -04:00
parent 67ddf8745b
commit 16d28853fa
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -821,7 +821,6 @@ calculate_col_widths (ClutterTableLayout *self,
child = clutter_actor_get_next_sibling (child)) child = clutter_actor_get_next_sibling (child))
{ {
ClutterTableChild *meta; ClutterTableChild *meta;
DimensionData *col;
gfloat c_min, c_pref; gfloat c_min, c_pref;
gfloat min_width, pref_width; gfloat min_width, pref_width;
gint start_col, end_col; gint start_col, end_col;
@ -838,7 +837,6 @@ calculate_col_widths (ClutterTableLayout *self,
if (meta->col_span < 2) if (meta->col_span < 2)
continue; continue;
col = &columns[meta->col];
start_col = meta->col; start_col = meta->col;
end_col = meta->col + meta->col_span - 1; end_col = meta->col + meta->col_span - 1;
@ -856,9 +854,9 @@ calculate_col_widths (ClutterTableLayout *self,
if (columns[i].expand) if (columns[i].expand)
n_expand++; n_expand++;
if (!col->visible) if (!columns[i].visible)
{ {
col->visible = TRUE; columns[i].visible = TRUE;
priv->visible_cols += 1; priv->visible_cols += 1;
} }
} }