From 8c0be4181bc48917535177b3ce61f87d78f0c27d Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Wed, 21 Mar 2012 10:36:42 -0400
Subject: [PATCH] table-layout: Fix x/y-expand for spanning actors

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 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/clutter/clutter-table-layout.c b/clutter/clutter-table-layout.c
index f4278bf3b..76289a7f1 100644
--- 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);