clutter-flow-layout: fix non-0,0 offset allocation
authorDan Winship <danw@gnome.org>
Fri, 2 Sep 2011 16:51:46 +0000 (12:51 -0400)
committerDan Winship <danw@gnome.org>
Mon, 5 Sep 2011 16:21:18 +0000 (12:21 -0400)
https://bugzilla.gnome.org/show_bug.cgi?id=649631

clutter/clutter-flow-layout.c

index 765c22d..b1d9ac5 100644 (file)
@@ -622,7 +622,7 @@ clutter_flow_layout_allocate (ClutterLayoutManager   *manager,
               item_x = x_off;
             }
 
-          new_x = ((line_item_count + 1) * (avail_width + priv->col_spacing))
+          new_x = x_off + ((line_item_count + 1) * (avail_width + priv->col_spacing))
                 / items_per_line;
           item_width = new_x - item_x - priv->col_spacing;
           item_height = g_array_index (priv->line_natural,
@@ -661,7 +661,7 @@ clutter_flow_layout_allocate (ClutterLayoutManager   *manager,
               item_y = y_off;
             }
 
-          new_y = ((line_item_count + 1) * (avail_height + priv->row_spacing))
+          new_y = y_off + ((line_item_count + 1) * (avail_height + priv->row_spacing))
                 / items_per_line;
           item_height = new_y - item_y - priv->row_spacing;
           item_width = g_array_index (priv->line_natural,