From 40df4dee2b788e32b2efaf9cd0c33e320e703407 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 6 Dec 2007 10:49:46 +0000 Subject: [PATCH] 2007-12-06 Emmanuele Bassi * clutter/clutter-label.c (clutter_label_ensure_layout): If the label has a requested size, force it when ensuring the layout. --- ChangeLog | 5 +++++ clutter/clutter-label.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 60869f4a8..eb0989ea6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-12-06 Emmanuele Bassi + + * clutter/clutter-label.c (clutter_label_ensure_layout): If the + label has a requested size, force it when ensuring the layout. + 2007-12-06 Emmanuele Bassi * tests/test-unproject.c: Fix type comparison. diff --git a/clutter/clutter-label.c b/clutter/clutter-label.c index 5550f2aa6..390dcef32 100644 --- a/clutter/clutter-label.c +++ b/clutter/clutter-label.c @@ -264,7 +264,8 @@ clutter_label_ensure_layout (ClutterLabel *label) } } else - pango_layout_set_width (priv->layout, -1); + pango_layout_set_width (priv->layout, (width > 0 ? width * PANGO_SCALE + : -1)); } CLUTTER_NOTE (ACTOR, "Label width set to %d pixels", width);