55 lines
1.5 KiB
Diff
55 lines
1.5 KiB
Diff
From cc515ab11cf91412cd99deac3e2945d7ed4e2dae Mon Sep 17 00:00:00 2001
|
|
From: Emmanuele Bassi <ebassi@gnome.org>
|
|
Date: Wed, 28 Mar 2012 08:34:36 +0100
|
|
Subject: [PATCH] table-layout: Fix [xy]_expand
|
|
|
|
A copy and paste thinko.
|
|
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=672853
|
|
---
|
|
clutter/clutter-table-layout.c | 7 ++-----
|
|
1 files changed, 2 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/clutter/clutter-table-layout.c b/clutter/clutter-table-layout.c
|
|
index ab7b5b2..fd216f3 100644
|
|
--- a/clutter/clutter-table-layout.c
|
|
+++ b/clutter/clutter-table-layout.c
|
|
@@ -861,7 +861,7 @@ calculate_col_widths (ClutterTableLayout *self,
|
|
}
|
|
|
|
if (!columns[i].expand)
|
|
- columns[i].expand = meta->x_fill;
|
|
+ columns[i].expand = meta->x_expand;
|
|
}
|
|
min_width += priv->col_spacing * (meta->col_span - 1);
|
|
pref_width += priv->col_spacing * (meta->col_span - 1);
|
|
@@ -915,8 +915,6 @@ calculate_col_widths (ClutterTableLayout *self,
|
|
}
|
|
}
|
|
}
|
|
-
|
|
-
|
|
}
|
|
|
|
/* calculate final widths */
|
|
@@ -1135,7 +1133,7 @@ calculate_row_heights (ClutterTableLayout *self,
|
|
}
|
|
|
|
if (!rows[i].expand)
|
|
- rows[i].expand = meta->y_fill;
|
|
+ rows[i].expand = meta->y_expand;
|
|
}
|
|
|
|
min_height += priv->row_spacing * (meta->row_span - 1);
|
|
@@ -1200,7 +1198,6 @@ calculate_row_heights (ClutterTableLayout *self,
|
|
}
|
|
}
|
|
}
|
|
-
|
|
}
|
|
|
|
/* calculate final heights */
|
|
--
|
|
1.7.7.6
|
|
|