brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flow-layout: Use the natural size

Browse Source 
Fix a copy-and-paste thinko where the cell size was computed using the
minimum size instead of the natural size. For actors with a minimum size
of zero, like Textures, this implied always a zero allocation.

Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
This commit is contained in:
Bastian Winkler 2009-12-03 15:38:05 +00:00 committed by Emmanuele Bassi
parent 7f58c14dcd
commit 18860eb16f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clutter/clutter-flow-layout.c
View File

@ -554,7 +554,7 @@ clutter_flow_layout_allocate (ClutterLayoutManager *manager,
clutter_actor_get_preferred_width (child, item_height, clutter_actor_get_preferred_width (child, item_height,
&child_min, &child_min,
&child_natural); &child_natural);
item_width = MIN (item_width, child_min); item_width = MIN (item_width, child_natural);
clutter_actor_get_preferred_height (child, item_width, clutter_actor_get_preferred_height (child, item_width,
&child_min, &child_min,
@ -593,7 +593,7 @@ clutter_flow_layout_allocate (ClutterLayoutManager *manager,
clutter_actor_get_preferred_width (child, item_height, clutter_actor_get_preferred_width (child, item_height,
&child_min, &child_min,
&child_natural); &child_natural);
item_width = MIN (item_width, child_min); item_width = MIN (item_width, child_natural);
clutter_actor_get_preferred_height (child, item_width, clutter_actor_get_preferred_height (child, item_width,
&child_min, &child_min,