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

bin-layout: Ensure that fixed position get a 0.0 alignment

Browse Source 
If the actor has a fixed position set, but it's not using the BinLayout
alignment enumeration to set its alignment, then we force the alignment
factor to 0.0; this is consistent with what happens with an explicit
alignment of CLUTTER_BIN_ALIGNMENT_FIXED.

https://bugzilla.gnome.org/show_bug.cgi?id=682265
This commit is contained in:
Emmanuele Bassi 2012-08-20 14:47:53 +01:00
parent 044c04ea8b
commit 8536314dbf
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -504,7 +504,11 @@ clutter_bin_layout_allocate (ClutterLayoutManager *manager,
else
{
x_fill = (layer->x_align == CLUTTER_BIN_ALIGNMENT_FILL);
x_align = get_bin_alignment_factor (layer->x_align);
if (!is_fixed_position_set)
x_align = get_bin_alignment_factor (layer->x_align);
else
x_align = 0.0;
}
if (clutter_actor_needs_expand (child, CLUTTER_ORIENTATION_VERTICAL))
@ -518,7 +522,11 @@ clutter_bin_layout_allocate (ClutterLayoutManager *manager,
else
{
y_fill = (layer->y_align == CLUTTER_BIN_ALIGNMENT_FILL);
y_align = get_bin_alignment_factor (layer->y_align);
if (!is_fixed_position_set)
y_align = get_bin_alignment_factor (layer->y_align);
else
y_align = 0.0;
}
clutter_actor_allocate_align_fill (child, &child_alloc,