diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2006-05-08 22:40:20 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2006-05-08 22:40:20 +0000 |
| commit | 7ca4c93e80c0f6caa97c0ee9093593bbe5082c0f (patch) | |
| tree | 997272018587100cbcf9f71c7c7d45def0b0a729 | |
| parent | a35a4abc615c6dbc30bf328f4e82c89e139e978b (diff) | |
| download | gdm-7ca4c93e80c0f6caa97c0ee9093593bbe5082c0f.tar.gz | |
Now be smarter about child allocation width when working with fixed.
2006-05-08 Brian Cameron <brian.cameron@sun.com>
* gui/greeter/greeter_geometry.c: Now be smarter about child
allocation width when working with fixed.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gui/greeter/greeter_geometry.c | 6 |
2 files changed, 11 insertions, 2 deletions
@@ -1,4 +1,9 @@ -2006-05-04 Brian Cameron <brian.cameron@sun.com> +2006-05-08 Brian Cameron <brian.cameron@sun.com> + + * gui/greeter/greeter_geometry.c: Now be smarter about child + allocation width when working with fixed. + +2006-05-08 Brian Cameron <brian.cameron@sun.com> * daemon/slave.c: Fix reference to the security/AllowRemoteAutoLogin so it is accessed as a boolean, not a string. Fixes remote diff --git a/gui/greeter/greeter_geometry.c b/gui/greeter/greeter_geometry.c index 2e377c28..cadab244 100644 --- a/gui/greeter/greeter_geometry.c +++ b/gui/greeter/greeter_geometry.c @@ -167,7 +167,11 @@ greeter_size_allocate_fixed (GreeterItemInfo *fixed, if (child->item_type != GREETER_ITEM_TYPE_LABEL) fixup_from_anchor (&child_allocation, child->anchor); - + + if (child_allocation.x + child_allocation.width > allocation->x + allocation->width) + child_allocation.width -= (child_allocation.x + child_allocation.width + - allocation->x - allocation->width); + greeter_item_size_allocate (child, &child_allocation, canvas); |