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

BinLayout: Always use fixed_x/y for FIXED if set

Browse Source 
We want to use the actually set value for x/y, not the current allocation,
as that might be a transition from an earlier allocation animation.
This commit is contained in:
Alexander Larsson 2012-06-07 16:44:08 +02:00
parent fd8dcfcc56
commit 76f1a42ef8
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clutter/clutter-bin-layout.c
View File

@ -454,7 +454,7 @@ clutter_bin_layout_allocate (ClutterLayoutManager *manager,
ClutterBinLayer *layer; ClutterBinLayer *layer;
ClutterActorBox child_alloc = { 0, }; ClutterActorBox child_alloc = { 0, };
gdouble x_align, y_align; gdouble x_align, y_align;
gboolean x_fill, y_fill; gboolean x_fill, y_fill, is_set;
meta = clutter_layout_manager_get_child_meta (manager, meta = clutter_layout_manager_get_child_meta (manager,
container, container,
@ -462,12 +462,20 @@ clutter_bin_layout_allocate (ClutterLayoutManager *manager,
layer = CLUTTER_BIN_LAYER (meta); layer = CLUTTER_BIN_LAYER (meta);
if (layer->x_align == CLUTTER_BIN_ALIGNMENT_FIXED) if (layer->x_align == CLUTTER_BIN_ALIGNMENT_FIXED)
child_alloc.x1 = clutter_actor_get_x (child); {
g_object_get (child, "fixed-position-set", &is_set, "fixed-x", &child_alloc.x1, NULL);
if (!is_set)
child_alloc.x1 = clutter_actor_get_x (child);
}
else else
child_alloc.x1 = allocation_x; child_alloc.x1 = allocation_x;
if (layer->y_align == CLUTTER_BIN_ALIGNMENT_FIXED) if (layer->y_align == CLUTTER_BIN_ALIGNMENT_FIXED)
child_alloc.y1 = clutter_actor_get_y (child); {
g_object_get (child, "fixed-position-set", &is_set, "fixed-y", &child_alloc.y1, NULL);
if (!is_set)
child_alloc.y1 = clutter_actor_get_y (child);
}
else else
child_alloc.y1 = allocation_y; child_alloc.y1 = allocation_y;