[gtk+/combo-refactor: 13/23] Changed GtkCellRendererText to request less than wrap-width if the text is smaller than the wrap-wid

[Tristan Van Berkom <tvb src gnome org>]

commit 67c00f3a16cb22139202aa1fc61f73073c7fb389
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Fri Nov 19 15:01:07 2010 +0900

    Changed GtkCellRendererText to request less than wrap-width if the text is smaller than the wrap-width (or width-chars).

 gtk/gtkcellrenderertext.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index a93f16c..f19d9ad 100644
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -2167,12 +2167,14 @@ gtk_cell_renderer_text_get_preferred_width (GtkCellRenderer *cell,
   
   if ((priv->ellipsize_set && priv->ellipsize != PANGO_ELLIPSIZE_NONE) || priv->width_chars > 0)
     min_width = 
-      xpad * 2 + (PANGO_PIXELS (char_width) * MAX (priv->width_chars, ellipsize_chars));
+      xpad * 2 + 
+      MIN (PANGO_PIXELS (text_width), 
+	   (PANGO_PIXELS (char_width) * MAX (priv->width_chars, ellipsize_chars)));
   /* If no width-chars set, minimum for wrapping text will be the wrap-width */
   else if (priv->wrap_width > -1)
-    min_width = xpad * 2 + rect.x + priv->wrap_width;
+    min_width = xpad * 2 + rect.x + MIN (PANGO_PIXELS (text_width), priv->wrap_width);
   else
-    min_width = xpad * 2 + rect.x + guess_width;
+    min_width = xpad * 2 + rect.x + PANGO_PIXELS (text_width);
 
   if (priv->width_chars > 0)
     nat_width = xpad * 2 +