diff options
| author | Ramiro Estrugo <ramiro@src.gnome.org> | 2000-09-07 19:12:12 +0000 |
|---|---|---|
| committer | Ramiro Estrugo <ramiro@src.gnome.org> | 2000-09-07 19:12:12 +0000 |
| commit | 0922f4e497236552d001022504dad848a3267d55 (patch) | |
| tree | 76439b31361168a20eb4eb290a849cfcc1c4bb48 /libnautilus-private/nautilus-scalable-font.c | |
| parent | 00436408379ea65e729c2a18c2a0fcffcca884b0 (diff) | |
| download | nautilus-0922f4e497236552d001022504dad848a3267d55.tar.gz | |
Simplify the highlight color initialization.
* libnautilus-extensions/nautilus-icon-canvas-item.c:
(nautilus_icon_canvas_item_initialize_class),
(draw_or_measure_label_text):
Simplify the highlight color initialization.
* libnautilus-extensions/nautilus-scalable-font.c:
(nautilus_text_layout_paint):
Restore rendering in the passed in color. Add a mini hack to make
sure the color is opaque.
Diffstat (limited to 'libnautilus-private/nautilus-scalable-font.c')
| -rw-r--r-- | libnautilus-private/nautilus-scalable-font.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libnautilus-private/nautilus-scalable-font.c b/libnautilus-private/nautilus-scalable-font.c index ba952b3f0..b8faa9a90 100644 --- a/libnautilus-private/nautilus-scalable-font.c +++ b/libnautilus-private/nautilus-scalable-font.c @@ -1666,8 +1666,14 @@ nautilus_text_layout_paint (const NautilusTextLayout *text_layout, g_return_if_fail (text_layout != NULL); g_return_if_fail (destination_pixbuf != NULL); g_return_if_fail (justification >= GTK_JUSTIFY_LEFT && justification <= GTK_JUSTIFY_FILL); - - /* y += text_layout->font->ascent; */ + + /* FIXME: Make sure the color we are fed is opaque. The real solution is + * to fix the callers. + */ + color = NAUTILUS_RGBA_COLOR_PACK (NAUTILUS_RGBA_COLOR_GET_R (color), + NAUTILUS_RGBA_COLOR_GET_G (color), + NAUTILUS_RGBA_COLOR_GET_B (color), + 255); for (item = text_layout->rows; item; item = item->next) { if (item->data) { @@ -1702,7 +1708,7 @@ nautilus_text_layout_paint (const NautilusTextLayout *text_layout, text_layout->font_size, row->text, row->text_length, - NAUTILUS_RGBA_COLOR_PACK (255, 255, 255, 255), + color, 255, inverted); |