[gnome-shell] St: fix allocation to not use both wfh and hfw
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] St: fix allocation to not use both wfh and hfw
- Date: Tue, 11 May 2010 20:02:22 +0000 (UTC)
commit 74ccdbf3a9c7ecc9ee08d439df144ccb2e7a142d
Author: Dan Winship <danw gnome org>
Date: Tue May 11 14:46:26 2010 -0400
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
src/st/st-private.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/st/st-private.c b/src/st/st-private.c
index 7586e2b..dd64cb8 100644
--- a/src/st/st-private.c
+++ b/src/st/st-private.c
@@ -155,7 +155,7 @@ _st_allocate_fill (StWidget *parent,
if (request == CLUTTER_REQUEST_HEIGHT_FOR_WIDTH)
{
- clutter_actor_get_preferred_width (child, available_height,
+ clutter_actor_get_preferred_width (child, -1,
&min_width,
&natural_width);
@@ -169,7 +169,7 @@ _st_allocate_fill (StWidget *parent,
}
else
{
- clutter_actor_get_preferred_height (child, available_width,
+ clutter_actor_get_preferred_height (child, -1,
&min_height,
&natural_height);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]