← Back to branch summary

~ubuntu-branches/ubuntu/vivid/clutter-1.0/vivid-proposed

« back to all changes in this revision

Viewing changes to clutter/clutter-bin-layout.c

  • Committer: Package Import Robot
  • Author(s): Rico Tzschichholz
  • Date: 2011-09-02 10:05:24 UTC
  • mfrom: (1.3.15 upstream)
  • mto: This revision was merged to the branch mainline in revision 14.
  • Revision ID: package-import@ubuntu.com-20110902100524-jr0nl60pmemx1s25
Tags: 1.7.12-1
* New upstream release
* debian/libclutter-1.0-0.symbols{.armel}:
  - Updated
* debian/control.in:
  - Fix build-dep on libcogl-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
clutter/clutter-bin-layout.c
428
428
{
429
429
  GList *children = clutter_container_get_children (container);
430
430
  GList *l;
 
431
  gfloat allocation_x, allocation_y;
431
432
  gfloat available_w, available_h;
432
433
 
433
 
  available_w = clutter_actor_box_get_width (allocation);
434
 
  available_h = clutter_actor_box_get_height (allocation);
 
434
  clutter_actor_box_get_origin (allocation, &allocation_x, &allocation_y);
 
435
  clutter_actor_box_get_size (allocation, &available_w, &available_h);
435
436
 
436
437
  for (l = children; l != NULL; l = l->next)
437
438
    {
450
451
      if (layer->x_align == CLUTTER_BIN_ALIGNMENT_FIXED)
451
452
        child_alloc.x1 = clutter_actor_get_x (child);
452
453
      else
453
 
        child_alloc.x1 = 0.0f;
 
454
        child_alloc.x1 = allocation_x;
454
455
 
455
456
      if (layer->y_align == CLUTTER_BIN_ALIGNMENT_FIXED)
456
457
        child_alloc.y1 = clutter_actor_get_y (child);
457
458
      else
458
 
        child_alloc.y1 = 0.0f;
 
459
        child_alloc.y1 = allocation_y;
459
460
 
460
461
      child_alloc.x2 = available_w;
461
462
      child_alloc.y2 = available_h;