summaryrefslogtreecommitdiff
path: root/gtk/gtkmenuitem.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2018-03-31 21:02:28 +0200
committerBenjamin Otte <otte@redhat.com>2018-04-05 14:56:38 +0200
commit169203951b1a338e0a7ef737238731619e5b8c4a (patch)
tree61eebf0a1f0a4b777e3ce58e779b2aa5fda31f63 /gtk/gtkmenuitem.c
parentfc6de135fe30ad285c50267bc9d24e10135bcc2c (diff)
downloadgtk+-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/gtkmenuitem.c')
-rw-r--r--gtk/gtkmenuitem.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index a9b4c56812..401ce6746d 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -254,14 +254,11 @@ gtk_menu_item_actionable_interface_init (GtkActionableInterface *iface)
static void
gtk_menu_item_size_allocate (GtkWidget *widget,
const GtkAllocation *allocation,
- int baseline,
- GtkAllocation *out_clip)
+ int baseline)
{
GtkMenuItem *menu_item = GTK_MENU_ITEM (widget);
GtkMenuItemPrivate *priv = menu_item->priv;
GtkAllocation child_allocation;
- GtkAllocation arrow_clip = { 0 };
- GtkAllocation child_clip = *allocation;
GtkTextDirection direction;
GtkPackDirection child_pack_dir;
GtkWidget *child;
@@ -331,14 +328,12 @@ gtk_menu_item_size_allocate (GtkWidget *widget,
arrow_alloc.y = child_allocation.y +
(child_allocation.height - arrow_alloc.height) / 2;
- gtk_widget_size_allocate(priv->arrow_widget, &arrow_alloc, baseline, &arrow_clip);
- gdk_rectangle_union (out_clip, &arrow_clip, out_clip);
+ gtk_widget_size_allocate(priv->arrow_widget, &arrow_alloc, baseline);
}
child_allocation.width = MAX (1, child_allocation.width);
- 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 (priv->submenu)