projects
/
profile
/
ivi
/
clutter.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
16d2885
)
table-layout: Fix x/y-expand for spanning actors
author
Jasper St. Pierre
<jstpierre@mecheye.net>
Wed, 21 Mar 2012 14:36:42 +0000
(10:36 -0400)
committer
Jasper St. Pierre
<jstpierre@mecheye.net>
Wed, 21 Mar 2012 15:41:25 +0000
(11:41 -0400)
Ported to ClutterTableLayout from MxTable:
https://github.com/clutter-project/mx/commit/
239e53146a678ae753b1fb9a862f4030c66a1d9b
https://bugzilla.gnome.org/show_bug.cgi?id=672557
clutter/clutter-table-layout.c
patch
|
blob
|
history
diff --git
a/clutter/clutter-table-layout.c
b/clutter/clutter-table-layout.c
index
f4278bf
..
76289a7
100644
(file)
--- a/
clutter/clutter-table-layout.c
+++ b/
clutter/clutter-table-layout.c
@@
-859,6
+859,9
@@
calculate_col_widths (ClutterTableLayout *self,
columns[i].visible = TRUE;
priv->visible_cols += 1;
}
+
+ if (!columns[i].expand)
+ columns[i].expand = meta->x_fill;
}
min_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;
priv->visible_rows += 1;
}
+
+ if (!rows[i].expand)
+ rows[i].expand = meta->y_fill;
}
min_height += priv->row_spacing * (meta->row_span - 1);