diff options
| author | Ramiro Estrugo <ramiro@src.gnome.org> | 2000-09-04 15:05:39 +0000 |
|---|---|---|
| committer | Ramiro Estrugo <ramiro@src.gnome.org> | 2000-09-04 15:05:39 +0000 |
| commit | 93861b3494f85f749a1d3bcc2225720989ca61a5 (patch) | |
| tree | b3b6bc6c83c9767f4f94b3236b39d9abfe94e3aa /src/nautilus-about.c | |
| parent | 31cb07f67aeff1c10fb4ebce4fb80b24f566b06c (diff) | |
| download | nautilus-93861b3494f85f749a1d3bcc2225720989ca61a5.tar.gz | |
Work on task 1588.
* libnautilus-extensions/nautilus-scalable-font.c:
(nautilus_scalable_font_measure_text),
(nautilus_scalable_font_draw_text),
(nautilus_scalable_font_measure_text_lines),
(nautilus_scalable_font_draw_text_lines),
(nautilus_scalable_font_measure_text_lines),
(nautilus_scalable_font_draw_text_lines),
(nautilus_scalable_font_largest_fitting_font_size):
* libnautilus-extensions/nautilus-scalable-font.h:
Change api to accept a string with embedded new lines instead of
an array of strings. This simplifies many things.
* libnautilus-extensions/nautilus-label.c:
(nautilus_label_initialize), (nautilus_label_destroy),
(render_buffer_pixbuf), (label_recompute_line_geometries):
Update for NautilusScalalbleFont api changes. No longer need to
tokenize the text string. we can feed the string to the rendering
api as is.
* librsvg/rsvg-ft.c: (rsvg_ft_render_string):
* librsvg/rsvg-ft.h:
Change the string to glyph rendering api to accept the string
length rather than computing it. This makes it possible to feed
it arbitrary lengths.
* librsvg/rsvg.c: (rsvg_text_handler_characters):
* librsvg/test-ft-gtk.c: (draw_line):
* librsvg/test-ft.c: (main):
Update for api changes.
* src/nautilus-about.c: (draw_aa_string):
* src/nautilus-sidebar-tabs.c: (draw_one_tab_plain),
(draw_one_tab_themed), (get_tab_width):
* test/test-nautilus-font.c: (main):
Update test to use text lines drawing api.
* test/test-nautilus-label.c:
(alpha_background_color_value_changed_callback), (main):
Update test for 2 new lines in a row.
Diffstat (limited to 'src/nautilus-about.c')
| -rw-r--r-- | src/nautilus-about.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nautilus-about.c b/src/nautilus-about.c index 61d4461a3..688afba08 100644 --- a/src/nautilus-about.c +++ b/src/nautilus-about.c @@ -192,7 +192,7 @@ draw_aa_string (NautilusScalableFont *font, GdkPixbuf *pixbuf, int font_size, in ArtIRect dest_rect; int text_width, text_height; - nautilus_scalable_font_measure_text (font, font_size, font_size, text, &text_width, &text_height); + nautilus_scalable_font_measure_text (font, font_size, font_size, text, strlen (text), &text_width, &text_height); /* draw the title in shadowed text*/ @@ -204,13 +204,13 @@ draw_aa_string (NautilusScalableFont *font, GdkPixbuf *pixbuf, int font_size, in if (shadow_offset) { dest_rect.x0 += shadow_offset; dest_rect.y0 += shadow_offset; - nautilus_scalable_font_draw_text (font, pixbuf, &dest_rect, font_size, font_size, text, shadow_color, 255); + nautilus_scalable_font_draw_text (font, pixbuf, &dest_rect, font_size, font_size, text, strlen (text), shadow_color, 255); dest_rect.x0 -= shadow_offset; dest_rect.y0 -= shadow_offset; } - nautilus_scalable_font_draw_text (font, pixbuf, &dest_rect, font_size, font_size, text, color, 255); + nautilus_scalable_font_draw_text (font, pixbuf, &dest_rect, font_size, font_size, text, strlen (text), color, 255); } /* draw the information onto the pixbuf */ |