isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 19:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

actor: Use fixed positioning for allocate_preferred_size

Browse Source 
clutter_actor_allocate_preferred_size is supposed to use the fixed
position of an actor. Unfortunately, recent refactorings made it so
that it accidentally used the current allocation. As the current
allocation may be adjusted by the actor, or have been previously
allocated in a strange spot, it may have unintended side effects. Use
the fixed positioning of the actor instead.

This fixes weird issues with margins colliding with
ClutterFixedLayout, causing strange offsets on relayout.

https://bugzilla.gnome.org/show_bug.cgi?id=689316
This commit is contained in:
Jasper St. Pierre 2012-11-29 18:36:10 -05:00
parent 75b521de6e
commit 15b811840c
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
clutter/clutter-actor.c
View File

@ -15097,11 +15097,24 @@ clutter_actor_allocate_preferred_size (ClutterActor *self,
gfloat actor_x, actor_y;
gfloat natural_width, natural_height;
ClutterActorBox actor_box;
ClutterActorPrivate *priv;
const ClutterLayoutInfo *info;
g_return_if_fail (CLUTTER_IS_ACTOR (self));
actor_x = clutter_actor_get_x (self);
actor_y = clutter_actor_get_y (self);
priv = self->priv;
if (priv->position_set)
{
info = _clutter_actor_get_layout_info_or_defaults (self);
actor_x = info->fixed_pos.x;
actor_y = info->fixed_pos.y;
}
else
{
actor_x = 0;
actor_y = 0;
}
clutter_actor_get_preferred_size (self,
NULL, NULL,