diff options
| author | Benjamin Otte <otte@redhat.com> | 2018-03-31 21:02:28 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2018-04-05 14:56:38 +0200 |
| commit | 169203951b1a338e0a7ef737238731619e5b8c4a (patch) | |
| tree | 61eebf0a1f0a4b777e3ce58e779b2aa5fda31f63 /gtk/gtkpathbar.c | |
| parent | fc6de135fe30ad285c50267bc9d24e10135bcc2c (diff) | |
| download | gtk+-169203951b1a338e0a7ef737238731619e5b8c4a.tar.gz | |
widget: Remove clip from size-allocate vfunc
As the clip is no longer needed, get rid of it.
Diffstat (limited to 'gtk/gtkpathbar.c')
| -rw-r--r-- | gtk/gtkpathbar.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c index da0fd38b77..1ef48c1a6a 100644 --- a/gtk/gtkpathbar.c +++ b/gtk/gtkpathbar.c @@ -138,8 +138,7 @@ static void gtk_path_bar_measure (GtkWidget *widget, int *natural_baseline); static void gtk_path_bar_size_allocate (GtkWidget *widget, const GtkAllocation *allocation, - int baseline, - GtkAllocation *out_clip); + int baseline); static void gtk_path_bar_add (GtkContainer *container, GtkWidget *widget); static void gtk_path_bar_remove (GtkContainer *container, @@ -484,8 +483,7 @@ gtk_path_bar_update_slider_buttons (GtkPathBar *path_bar) static void gtk_path_bar_size_allocate (GtkWidget *widget, const GtkAllocation *allocation, - int baseline, - GtkAllocation *out_clip) + int baseline) { GtkWidget *child; GtkPathBar *path_bar = GTK_PATH_BAR (widget); @@ -498,7 +496,6 @@ gtk_path_bar_size_allocate (GtkWidget *widget, gint up_slider_offset = 0; gint down_slider_offset = 0; GtkRequisition child_requisition; - GtkAllocation child_clip; /* No path is set; we don't have to allocate anything. */ if (path_bar->priv->button_list == NULL) @@ -653,8 +650,7 @@ gtk_path_bar_size_allocate (GtkWidget *widget, gtk_widget_set_tooltip_text (child, NULL); gtk_widget_set_child_visible (child, TRUE); - gtk_widget_size_allocate (child, &child_allocation, baseline, &child_clip); - gdk_rectangle_union (out_clip, &child_clip, out_clip); + gtk_widget_size_allocate (child, &child_allocation, baseline); if (direction == GTK_TEXT_DIR_RTL) { @@ -685,8 +681,7 @@ gtk_path_bar_size_allocate (GtkWidget *widget, child_allocation.x = up_slider_offset + allocation->x; gtk_widget_size_allocate (path_bar->priv->up_slider_button, &child_allocation, - -1, &child_clip); - gdk_rectangle_union (out_clip, &child_clip, out_clip); + -1); gtk_widget_set_child_visible (path_bar->priv->up_slider_button, TRUE); gtk_widget_show (path_bar->priv->up_slider_button); @@ -706,8 +701,7 @@ gtk_path_bar_size_allocate (GtkWidget *widget, gtk_widget_size_allocate (path_bar->priv->down_slider_button, &child_allocation, - -1, &child_clip); - gdk_rectangle_union (out_clip, &child_clip, out_clip); + -1); gtk_widget_set_child_visible (path_bar->priv->down_slider_button, TRUE); gtk_widget_show (path_bar->priv->down_slider_button); |