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

headerbar: Compute clip directly

Browse Source
This commit is contained in:
Timm Bäder 2017-04-27 15:45:08 +02:00
parent 179b8b0cbc
commit 2a0a87049e
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkheaderbar.c
View File

@ -959,6 +959,7 @@ gtk_header_bar_allocate_contents (GtkCssGadget *gadget,
gint x;
gint child_size;
GtkTextDirection direction;
GtkAllocation child_clip;
direction = gtk_widget_get_direction (widget);
nvis_children = count_visible_children (bar);
@ -1136,6 +1137,8 @@ gtk_header_bar_allocate_contents (GtkCssGadget *gadget,
child_allocation.x = allocation->x + allocation->width - (child_allocation.x - allocation->x) - child_allocation.width;
gtk_widget_size_allocate (child->widget, &child_allocation);
gtk_widget_get_clip (child->widget, &child_clip);
gdk_rectangle_union (&child_clip, out_clip, out_clip);
next:
i++;
@ -1171,7 +1174,11 @@ gtk_header_bar_allocate_contents (GtkCssGadget *gadget,
child_allocation.x = allocation->x + allocation->width - (child_allocation.x - allocation->x) - child_allocation.width;
if (title_widget != NULL)
gtk_widget_size_allocate (title_widget, &child_allocation);
{
gtk_widget_size_allocate (title_widget, &child_allocation);
gtk_widget_get_clip (title_widget, &child_clip);
gdk_rectangle_union (&child_clip, out_clip, out_clip);
}
child_allocation.y = allocation->y;
child_allocation.height = height;
@ -1185,6 +1192,8 @@ gtk_header_bar_allocate_contents (GtkCssGadget *gadget,
child_allocation.x = allocation->x + allocation->width - start_width + priv->spacing;
child_allocation.width = start_width - priv->spacing;
gtk_widget_size_allocate (priv->titlebar_start_box, &child_allocation);
gtk_widget_get_clip (priv->titlebar_start_box, &child_clip);
gdk_rectangle_union (&child_clip, out_clip, out_clip);
}
if (priv->titlebar_end_box)
@ -1196,9 +1205,9 @@ gtk_header_bar_allocate_contents (GtkCssGadget *gadget,
child_allocation.x = allocation->x + allocation->width - end_width + priv->spacing;
child_allocation.width = end_width - priv->spacing;
gtk_widget_size_allocate (priv->titlebar_end_box, &child_allocation);
gtk_widget_get_clip (priv->titlebar_end_box, &child_clip);
gdk_rectangle_union (&child_clip, out_clip, out_clip);
}
gtk_container_get_children_clip (GTK_CONTAINER (widget), out_clip);
}
/**