From 84c00d18bb526125bc7a95ed426f89dea766ce5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timm=20B=C3=A4der?= <mail@baedert.org>
Date: Wed, 28 Jun 2017 07:25:23 +0200
Subject: [PATCH] entry: Simplify progress size allocation

---
 gtk/gtkentry.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index a40c6d29ed..d0512711b1 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -3107,7 +3107,7 @@ gtk_entry_size_allocate (GtkWidget     *widget,
   GtkEntry *entry = GTK_ENTRY (widget);
   GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry);
   GdkRectangle clip = *allocation;
-  GtkAllocation child_clip = *allocation;
+  GtkAllocation child_clip;
   gint i;
 
   priv->text_baseline = -1;
@@ -3157,18 +3157,11 @@ gtk_entry_size_allocate (GtkWidget     *widget,
 
   if (priv->progress_widget && gtk_widget_get_visible (priv->progress_widget))
     {
-      int req_width;
       GtkAllocation progress_alloc;
 
-      gtk_widget_measure (priv->progress_widget,
-                          GTK_ORIENTATION_HORIZONTAL,
-                          allocation->height,
-                          &req_width, NULL,
-                          NULL, NULL);
-
       progress_alloc.x = 0;
       progress_alloc.y = 0;
-      progress_alloc.width = MAX (allocation->width, req_width);
+      progress_alloc.width = allocation->width;
       progress_alloc.height = allocation->height;
 
       gtk_widget_size_allocate (priv->progress_widget, &progress_alloc);