diff options
| author | Ramiro Estrugo <ramiro@src.gnome.org> | 2000-09-05 09:37:56 +0000 |
|---|---|---|
| committer | Ramiro Estrugo <ramiro@src.gnome.org> | 2000-09-05 09:37:56 +0000 |
| commit | 4025fec57a9b88a447e0390b17e244dbe2b293ab (patch) | |
| tree | 68867d5696830c5c29ea45e7cd6037ac1b873515 /libnautilus-private/nautilus-scalable-font.h | |
| parent | af9196b5108cbf78e0ad78d8915eeb21110ec64a (diff) | |
| download | nautilus-4025fec57a9b88a447e0390b17e244dbe2b293ab.tar.gz | |
More work on task 1588.
* libnautilus-extensions/nautilus-scalable-font.c:
(nautilus_scalable_font_draw_text),
(nautilus_scalable_font_measure_text_lines),
(nautilus_scalable_font_draw_text_lines):
* libnautilus-extensions/nautilus-scalable-font.h:
Change text rendering api to take in x,y coordinates along with a
clip_area.
Remove some #if 0 code i left in before.
Also change the text lines rendering api to optionally do its own
line measuring - for the convenience of the caller.
* libnautilus-extensions/nautilus-label.c: (render_buffer_pixbuf):
Update for text rendering changes.
Fix the justification bug.
Fix the multiple newlines bug.
* src/nautilus-about.c: (draw_aa_string):
Update for text rendering changes.
* src/nautilus-sidebar-tabs.c: (draw_one_tab_plain),
(draw_one_tab_themed):
Update for text rendering changes.
* test/test-nautilus-font.c: (main):
Update for text rendering changes.
Also add multiple new lines test and clipping test.
* test/test-nautilus-label.c: (main):
Update for text rendering changes.
Diffstat (limited to 'libnautilus-private/nautilus-scalable-font.h')
| -rw-r--r-- | libnautilus-private/nautilus-scalable-font.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libnautilus-private/nautilus-scalable-font.h b/libnautilus-private/nautilus-scalable-font.h index 7333b1639..448a52205 100644 --- a/libnautilus-private/nautilus-scalable-font.h +++ b/libnautilus-private/nautilus-scalable-font.h @@ -86,14 +86,16 @@ void nautilus_scalable_font_measure_text (const N guint *text_height_out); void nautilus_scalable_font_draw_text (const NautilusScalableFont *font, GdkPixbuf *destination_pixbuf, - const ArtIRect *destination_area, + int x, + int y, + const ArtIRect *clip_area, guint font_width, guint font_height, const char *text, guint text_length, guint32 color, guchar overall_alpha); -void nautilus_scalable_font_measure_text_lines (NautilusScalableFont *font, +void nautilus_scalable_font_measure_text_lines (const NautilusScalableFont *font, guint font_width, guint font_height, const char *text, @@ -104,13 +106,15 @@ void nautilus_scalable_font_measure_text_lines (Nautilu guint *total_height_out); void nautilus_scalable_font_draw_text_lines (const NautilusScalableFont *font, GdkPixbuf *destination_pixbuf, - const ArtIRect *destination_area, + int x, + int y, + const ArtIRect *clip_area, guint font_width, guint font_height, const char *text, guint num_text_lines, - const guint text_line_widths[], - const guint text_line_heights[], + const guint *text_line_widths, + const guint *text_line_heights, GtkJustification justification, guint line_offset, guint32 color, |