St: fix allocation to not use both wfh and hfw

Passing an explicit width in the wfh case or a height in the hfw case
messes up the request caching, and confuses actors that assume they
won't be called with an explicit width/height unless they're being
allocated along the other axis.

https://bugzilla.gnome.org/show_bug.cgi?id=618295
This commit is contained in:
Dan Winship 2010-05-11 14:46:26 -04:00
parent 80fc55b8ea
commit 74ccdbf3a9

View File

@ -155,7 +155,7 @@ _st_allocate_fill (StWidget *parent,
if (request == CLUTTER_REQUEST_HEIGHT_FOR_WIDTH) if (request == CLUTTER_REQUEST_HEIGHT_FOR_WIDTH)
{ {
clutter_actor_get_preferred_width (child, available_height, clutter_actor_get_preferred_width (child, -1,
&min_width, &min_width,
&natural_width); &natural_width);
@ -169,7 +169,7 @@ _st_allocate_fill (StWidget *parent,
} }
else else
{ {
clutter_actor_get_preferred_height (child, available_width, clutter_actor_get_preferred_height (child, -1,
&min_height, &min_height,
&natural_height); &natural_height);