[gtk+] GtkEntry: Fix a few irregularities in the size request code

[Matthias Clasen <matthiasc src gnome org>]

commit 9e002a024eb32acc0d28821fa3f9a4430346b8a3
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Feb 11 22:00:12 2014 -0500

    GtkEntry: Fix a few irregularities in the size request code
    
    We don't want the size request to change as icons come and
    go (thinking e.g. about the caps lock warning). Just make
    sure that we have enough room for showing the icons.

 gtk/gtkentry.c |   26 ++++++++------------------
 1 files changed, 8 insertions(+), 18 deletions(-)
---
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 7387f64..48a0be3 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -3360,25 +3360,25 @@ gtk_entry_get_preferred_width (GtkWidget *widget,
   PangoFontMetrics *metrics;
   GtkBorder borders;
   PangoContext *context;
-  gint icon_widths = 0;
   gint icon_width, i;
   gint min, nat;
   gint char_width;
   gint digit_width;
   gint char_pixels;
 
-  context = gtk_widget_get_pango_context (widget);
+  _gtk_entry_get_borders (entry, &borders);
 
+  context = gtk_widget_get_pango_context (widget);
   metrics = pango_context_get_metrics (context,
                                        pango_context_get_font_description (context),
                                        pango_context_get_language (context));
 
-  _gtk_entry_get_borders (entry, &borders);
-
   char_width = pango_font_metrics_get_approximate_char_width (metrics);
   digit_width = pango_font_metrics_get_approximate_digit_width (metrics);
   char_pixels = (MAX (char_width, digit_width) + PANGO_SCALE - 1) / PANGO_SCALE;
 
+  pango_font_metrics_unref (metrics);
+
   if (priv->width_chars < 0)
     min = MIN_ENTRY_WIDTH + borders.left + borders.right;
   else
@@ -3389,22 +3389,12 @@ gtk_entry_get_preferred_width (GtkWidget *widget,
   else
     nat = char_pixels * priv->max_width_chars + borders.left + borders.right;
 
-  nat = MAX (min, nat);
-
+  icon_width = 0;
   for (i = 0; i < MAX_ICONS; i++)
-    {
-      icon_width = get_icon_width (entry, i);
-      if (icon_width > 0)
-        icon_widths += icon_width;
-    }
-
-  if (icon_widths > min)
-    {
-      min += icon_widths;
-      nat += icon_width;
-    }
+    icon_width += get_icon_width (entry, i);
 
-  pango_font_metrics_unref (metrics);
+  min = MAX (min, icon_width);
+  nat = MAX (min, nat);
 
   *minimum = min;
   *natural = nat;