summaryrefslogtreecommitdiff
path: root/gtk/gtklabel.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2011-04-17 20:54:35 +0200
committerBenjamin Otte <otte@redhat.com>2011-04-19 22:18:18 +0200
commitffb23fb827cc5b8f3e244274c3b0d2241489aefc (patch)
treefe9d72acb97c56634c394ab21acc20d75cc96d37 /gtk/gtklabel.c
parentc8ce1106c11361f8b47dd4e9a08db571c7d66d82 (diff)
downloadgtk+-ffb23fb827cc5b8f3e244274c3b0d2241489aefc.tar.gz
label: Remove duplicated comment
Diffstat (limited to 'gtk/gtklabel.c')
-rw-r--r--gtk/gtklabel.c25
1 files changed, 6 insertions, 19 deletions
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 31d606d69d..2021f0a57a 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -3554,6 +3554,12 @@ gtk_label_get_preferred_layout_size (GtkLabel *label,
* - minimum size should be MAX (width-chars, 0)
* - natural size should be MIN (max-width-chars, strlen (priv->text))
*
+ * For ellipsizing labels; if max-width-chars is specified: either it is used as
+ * a minimum size or the label text as a minimum size (natural size still overflows).
+ *
+ * For wrapping labels; A reasonable minimum size is useful to naturally layout
+ * interfaces automatically. In this case if no "width-chars" is specified, the minimum
+ * width will default to the wrap guess that gtk_label_ensure_layout() does.
*/
layout = gtk_label_get_measuring_layout (label, NULL, -1);
@@ -3570,25 +3576,6 @@ gtk_label_get_preferred_layout_size (GtkLabel *label,
/* Fetch the length of the complete unwrapped text */
text_width = required->width;
- /* "width-chars" Hard-coded minimum width:
- * - minimum size should be MAX (width-chars, strlen ("..."));
- * - natural size should be MAX (width-chars, strlen (priv->text));
- *
- * "max-width-chars" User specified maximum size requisition
- * - minimum size should be MAX (width-chars, 0)
- * - natural size should be MIN (max-width-chars, strlen (priv->text))
- *
- * For ellipsizing labels; if max-width-chars is specified: either it is used as
- * a minimum size or the label text as a minimum size (natural size still overflows).
- *
- * For wrapping labels; A reasonable minimum size is useful to naturally layout
- * interfaces automatically. In this case if no "width-chars" is specified, the minimum
- * width will default to the wrap guess that gtk_label_ensure_layout() does.
- *
- * In *any* case the minimum width is completely overridden if an explicit width
- * request was provided.
- */
-
if (priv->ellipsize || priv->wrap)
{
gint char_pixels, ellipsize_chars;