From 75ea4332b52dbbdbed9641793ab99de6169d361c Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 22 Jan 2008 03:31:40 +0000 Subject: Mark behavior as undefined if height is not -1 and ellipsize mode is 2008-01-21 Behdad Esfahbod * pango/pango-layout.c (pango_layout_set_height()): Mark behavior as undefined if height is not -1 and ellipsize mode is PANGO_ELLIPSIZE_NONE. svn path=/trunk/; revision=2549 --- ChangeLog | 6 ++++++ pango/pango-layout.c | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45008911..4b297a2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-01-21 Behdad Esfahbod + + * pango/pango-layout.c (pango_layout_set_height()): Mark behavior as + undefined if height is not -1 and ellipsize mode is + PANGO_ELLIPSIZE_NONE. + 2008-01-21 Behdad Esfahbod Bug 508002 – change pango_layout_pixel_extents() to round logical rect diff --git a/pango/pango-layout.c b/pango/pango-layout.c index c1c79999..5924182d 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -392,15 +392,16 @@ pango_layout_get_width (PangoLayout *layout) * of how small the height value is. A value of zero will render exactly one * line for the entire layout. * - * If @height if it is negative, it will be the maximum number of lines per + * If @height is negative, it will be the (negative of) maximum number of lines per * paragraph. That is, the total number of lines shown may well be more than * this value if the layout contains multiple paragraphs of text. * The default value of -1 means that first line of each paragraph is ellipsized. * - * Currently the height setting only has effect if a positive width is set on + * Height setting only has effect if a positive width is set on * @layout and ellipsization mode of @layout is not %PANGO_ELLIPSIZE_NONE. - * This may change in the future. To be on the safe side, set height to -1 - * in all cases that it shouldn't have any effect. + * The behavior is undefined if a height other than -1 is set and + * ellipsization mode is set to %PANGO_ELLIPSIZE_NONE, and may change in the + * future. * * Since: 1.20 **/ -- cgit v1.2.1