diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2008-01-15 01:20:44 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2008-01-15 01:20:44 +0000 |
| commit | 0946d48d16c30e5b64e3ad946454324a3628be08 (patch) | |
| tree | 8e77638d0945c3e92d8435710bd683861014394f /pango/pango-layout-private.h | |
| parent | 7f7dbc1ecc87f11c03aea4a37e2011af3dd9b308 (diff) | |
| download | pango-0946d48d16c30e5b64e3ad946454324a3628be08.tar.gz | |
Bug 469313 – Add pango_layout_set_height() Bug 508179 – PangoGlyphUnit
2008-01-14 Behdad Esfahbod <behdad@gnome.org>
Bug 469313 – Add pango_layout_set_height()
Bug 508179 – PangoGlyphUnit confusion
* pango/pango-layout.h:
* pango/pango-layout-private.h:
* pango/pango-layout.c:
* pango/ellipsize.c (_pango_layout_line_ellipsize):
New public API:
pango_layout_set_height()
See docs for semantics. Currently only negative height values (number
of lines) is implemented.
* pango-view/viewer-render.c (make_layout), (output_body),
(parse_options):
Implement --height.
* pango/pango.def:
* docs/pango-sections.txt:
* docs/tmpl/layout.sgml:
Update.
2008-01-14 Behdad Esfahbod <behdad@gnome.org>
Bug 508179 – PangoGlyphUnit confusion
* pango/pangowin32.c:
* pango/glyphstring.c:
* pango/pango-layout.c (process_item): Remove all traces of
#PangoGlyphUnit
svn path=/trunk/; revision=2542
Diffstat (limited to 'pango/pango-layout-private.h')
| -rw-r--r-- | pango/pango-layout-private.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pango/pango-layout-private.h b/pango/pango-layout-private.h index a71865fc..f82c589c 100644 --- a/pango/pango-layout-private.h +++ b/pango/pango-layout-private.h @@ -40,7 +40,8 @@ struct _PangoLayout gchar *text; int length; /* length of text in bytes */ - int width; /* wrap width, in device units */ + int width; /* wrap/ellipsize width, in device units, or -1 if not set */ + int height; /* ellipsize width, in device units if positive, number of lines if negative */ int indent; /* amount by which first line should be shorter */ int spacing; /* spacing between lines */ @@ -75,7 +76,8 @@ struct _PangoLayout }; gboolean _pango_layout_line_ellipsize (PangoLayoutLine *line, - PangoAttrList *attrs); + PangoAttrList *attrs, + int goal_width); G_END_DECLS |