summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastian Winkler <buz@netbuz.org>2014-03-11 12:35:03 +0100
committerBastian Winkler <buz@netbuz.org>2014-03-12 00:37:59 +0100
commit014dbf105c42606ded74846d6f9a1214dfc0ab95 (patch)
treed5ea9090ccec1ad2d2bd3d6341c0daed78993834
parent293f35ef6f0805590e1d3d0d139b9c9dbde0fe3b (diff)
downloadclutter-014dbf105c42606ded74846d6f9a1214dfc0ab95.tar.gz
grid-layout: Use correct orientation when requesting preferred child size
Otherwise width and height are swapped. https://bugzilla.gnome.org/show_bug.cgi?id=725722
-rw-r--r--clutter/clutter-grid-layout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/clutter/clutter-grid-layout.c b/clutter/clutter-grid-layout.c
index 7724c92df..e9ef8f7bb 100644
--- a/clutter/clutter-grid-layout.c
+++ b/clutter/clutter-grid-layout.c
@@ -510,7 +510,7 @@ compute_request_for_child (ClutterGridRequest *request,
}
else
{
- if (orientation == CLUTTER_ORIENTATION_VERTICAL)
+ if (orientation == CLUTTER_ORIENTATION_HORIZONTAL)
clutter_actor_get_preferred_width (child, -1, minimum, natural);
else
clutter_actor_get_preferred_height (child, -1, minimum, natural);