diff options
author | Timm Bäder <mail@baedert.org> | 2017-06-28 07:25:23 +0200 |
---|---|---|
committer | Timm Bäder <mail@baedert.org> | 2017-06-28 13:21:00 +0200 |
commit | d6dbd6ac645e3b239e37ed637d1cc4358bc1ac30 (patch) | |
tree | 8f11e9d1c93b4ed30929998345d98b8932bb3bba | |
parent | 59f11b74ed3a39524e6a1fe415cf4adb0e46d9a8 (diff) | |
download | gtk+-d6dbd6ac645e3b239e37ed637d1cc4358bc1ac30.tar.gz |
entry: Simplify progress size allocation
-rw-r--r-- | gtk/gtkentry.c | 11 |
1 files 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); |