AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 22:41:43 +00:00
Code Issues Projects Releases Wiki Activity

entry: Simplify progress size allocation

Browse Source
This commit is contained in:
Timm Bäder 2017-06-28 07:25:23 +02:00 committed by Matthias Clasen
parent f520700b13
commit 84c00d18bb
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkentry.c
View File

@ -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);