AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

grid: Compute clip directly

Browse Source 
Instead of iterating over the children again in
gtk_container_get_children_clip
This commit is contained in:
Timm Bäder 2017-04-24 18:23:53 +02:00
parent 0938183ae6
commit 74ef45bfbf
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkgrid.c
View File

@ -1572,12 +1572,14 @@ allocate_child (GtkGridRequest *request,
static void
gtk_grid_request_allocate_children (GtkGridRequest *request,
const GtkAllocation *allocation)
const GtkAllocation *allocation,
GtkAllocation *out_clip)
{
GtkGridPrivate *priv = request->grid->priv;
GList *list;
GtkGridChild *child;
GtkAllocation child_allocation;
GtkAllocation child_clip;
gint x, y, width, height, baseline, ignore;
for (list = priv->children; list; list = list->next)
@ -1600,6 +1602,8 @@ gtk_grid_request_allocate_children (GtkGridRequest *request,
- (child_allocation.x - allocation->x) - child_allocation.width;
gtk_widget_size_allocate_with_baseline (child->widget, &child_allocation, baseline);
gtk_widget_get_clip (child->widget, &child_clip);
gdk_rectangle_union (out_clip, out_clip, &child_clip);
}
}
@ -1662,9 +1666,8 @@ gtk_grid_allocate (GtkCssGadget *gadget,
gtk_grid_request_position (&request, 0);
gtk_grid_request_position (&request, 1);
gtk_grid_request_allocate_children (&request, allocation);
gtk_container_get_children_clip (GTK_CONTAINER (grid), out_clip);
*out_clip = *allocation;
gtk_grid_request_allocate_children (&request, allocation, out_clip);
}
static gboolean