[gtk+/gtk-3-0] label: Always respect width-chars and max-width-chars

[Benjamin Otte <otte src gnome org>]

commit 2143c1835edc873dde6140613c8e98ae645e4c1a
Author: Paolo Borelli <pborelli gnome org>
Date:   Wed Apr 20 16:02:52 2011 +0200

    label: Always respect width-chars and max-width-chars
    
    Not just when labels are set to ellipsize or wrap.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=647284

 gtk/gtklabel.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 9f7c7ad..0d795d4 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -3081,7 +3081,7 @@ get_label_width (GtkLabel *label,
    *    request was provided.
    */
 
-  if (priv->ellipsize || priv->wrap)
+  if (priv->ellipsize || priv->wrap || priv->width_chars > 0 || priv->max_width_chars > 0)
     {
       *minimum = char_pixels * MAX (priv->width_chars, ellipsize_chars);