Mercurial > dwindows
comparison gtk3/dw.c @ 817:2d0681b8d8f6
Switched to using gdk_cairo_set_source_color() from the Cairo RGB function...
this fixes black and white rendering in several apps.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Sat, 26 Mar 2011 05:14:54 +0000 |
parents | 916002e29d4c |
children | c17634e2b303 |
comparison
equal
deleted
inserted
replaced
816:916002e29d4c | 817:2d0681b8d8f6 |
---|---|
6596 cr = cairo_create(pixmap->image); | 6596 cr = cairo_create(pixmap->image); |
6597 if(cr) | 6597 if(cr) |
6598 { | 6598 { |
6599 int index = _find_thread_index(dw_thread_id()); | 6599 int index = _find_thread_index(dw_thread_id()); |
6600 | 6600 |
6601 cairo_set_source_rgb(cr, _foreground[index].red, _foreground[index].green, _foreground[index].blue); | 6601 gdk_cairo_set_source_color (cr, &_foreground[index]); |
6602 cairo_set_line_width(cr, 1); | 6602 cairo_set_line_width(cr, 1); |
6603 cairo_move_to(cr, x, y); | 6603 cairo_move_to(cr, x, y); |
6604 cairo_stroke(cr); | 6604 cairo_stroke(cr); |
6605 cairo_destroy(cr); | 6605 cairo_destroy(cr); |
6606 } | 6606 } |
6628 cr = cairo_create(pixmap->image); | 6628 cr = cairo_create(pixmap->image); |
6629 if(cr) | 6629 if(cr) |
6630 { | 6630 { |
6631 int index = _find_thread_index(dw_thread_id()); | 6631 int index = _find_thread_index(dw_thread_id()); |
6632 | 6632 |
6633 cairo_set_source_rgb(cr, _foreground[index].red, _foreground[index].green, _foreground[index].blue); | 6633 gdk_cairo_set_source_color (cr, &_foreground[index]); |
6634 cairo_set_line_width(cr, 1); | 6634 cairo_set_line_width(cr, 1); |
6635 cairo_move_to(cr, x1, y1); | 6635 cairo_move_to(cr, x1, y1); |
6636 cairo_line_to(cr, x2, y2); | 6636 cairo_line_to(cr, x2, y2); |
6637 cairo_stroke(cr); | 6637 cairo_stroke(cr); |
6638 cairo_destroy(cr); | 6638 cairo_destroy(cr); |
6662 cr = cairo_create(pixmap->image); | 6662 cr = cairo_create(pixmap->image); |
6663 if(cr) | 6663 if(cr) |
6664 { | 6664 { |
6665 int index = _find_thread_index(dw_thread_id()); | 6665 int index = _find_thread_index(dw_thread_id()); |
6666 | 6666 |
6667 cairo_set_source_rgb(cr, _foreground[index].red, _foreground[index].green, _foreground[index].blue); | 6667 gdk_cairo_set_source_color (cr, &_foreground[index]); |
6668 cairo_set_line_width(cr, 1); | 6668 cairo_set_line_width(cr, 1); |
6669 cairo_move_to(cr, x[0], y[0]); | 6669 cairo_move_to(cr, x[0], y[0]); |
6670 for(z=1;z<npoints;z++) | 6670 for(z=1;z<npoints;z++) |
6671 { | 6671 { |
6672 cairo_line_to(cr, x[z], y[z]); | 6672 cairo_line_to(cr, x[z], y[z]); |
6701 cr = cairo_create(pixmap->image); | 6701 cr = cairo_create(pixmap->image); |
6702 if(cr) | 6702 if(cr) |
6703 { | 6703 { |
6704 int index = _find_thread_index(dw_thread_id()); | 6704 int index = _find_thread_index(dw_thread_id()); |
6705 | 6705 |
6706 cairo_set_source_rgb(cr, _foreground[index].red, _foreground[index].green, _foreground[index].blue); | 6706 gdk_cairo_set_source_color (cr, &_foreground[index]); |
6707 cairo_set_line_width(cr, 1); | 6707 cairo_set_line_width(cr, 1); |
6708 cairo_move_to(cr, x, y); | 6708 cairo_move_to(cr, x, y); |
6709 cairo_line_to(cr, x, y + height); | 6709 cairo_line_to(cr, x, y + height); |
6710 cairo_line_to(cr, x + width, y + height); | 6710 cairo_line_to(cr, x + width, y + height); |
6711 cairo_line_to(cr, x + width, y); | 6711 cairo_line_to(cr, x + width, y); |
6762 int index = _find_thread_index(dw_thread_id()); | 6762 int index = _find_thread_index(dw_thread_id()); |
6763 | 6763 |
6764 pango_layout_set_font_description(layout, font); | 6764 pango_layout_set_font_description(layout, font); |
6765 pango_layout_set_text(layout, text, strlen(text)); | 6765 pango_layout_set_text(layout, text, strlen(text)); |
6766 | 6766 |
6767 cairo_set_source_rgb(cr, _foreground[index].red, _foreground[index].green, _foreground[index].blue); | 6767 gdk_cairo_set_source_color (cr, &_foreground[index]); |
6768 cairo_move_to(cr, x, y); | 6768 cairo_move_to(cr, x, y); |
6769 pango_cairo_show_layout (cr, layout); | 6769 pango_cairo_show_layout (cr, layout); |
6770 | 6770 |
6771 g_object_unref(layout); | 6771 g_object_unref(layout); |
6772 } | 6772 } |