From 8632ec43eb54035457de9dae00c45bdf9b0e5f4e Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 3 Apr 2011 15:03:19 +0200 Subject: [PATCH] label: we can't ignore sizes on ellipsized labels So don't use this optimization when a label is ellipsized. https://bugzilla.gnome.org/show_bug.cgi?id=646517 --- gtk/gtklabel.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 72e4eb073..04bf4ffb3 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -3077,12 +3077,14 @@ gtk_label_get_measuring_layout (GtkLabel * label, } /* oftentimes we want to measure a width that is far wider than the current width, - * even though the layout is not wrapped. In that case, we can just return the - * current layout, because for measuring purposes, it will be identical. + * even though the layout would not change if we made it wider. In that case, we + * can just return the current layout, because for measuring purposes, it will be + * identical. */ pango_layout_get_extents (priv->layout, NULL, &rect); if ((width == -1 || rect.width <= width) && - !pango_layout_is_wrapped (priv->layout)) + !pango_layout_is_wrapped (priv->layout) && + !pango_layout_is_ellipsized (priv->layout)) { g_object_ref (priv->layout); return priv->layout; -- 2.43.2