(x_draw_glyph_string): Use strike_through_color, not underline_color,

to draw strike-through.
This commit is contained in:
Juanma Barranquero 2007-09-21 11:21:38 +00:00
parent 3bef54c922
commit e243eb1f50
2 changed files with 18 additions and 12 deletions

View file

@ -1,3 +1,8 @@
2007-09-21 Juanma Barranquero <lekktu@gmail.com>
* w32term.c (x_draw_glyph_string): Use strike_through_color, not
underline_color, to draw strike-through.
2007-09-20 Glenn Morris <rgm@gnu.org>
* process.c (Fmake_network_process): Doc fix.
@ -30,7 +35,8 @@
scope and rename to omfib_buffer for clarity.
(gif_load) <interlace_start, interlace_increment>: Move to file scope.
2007-09-14 Peter O'Gorman <bug-gnu-emacs@mlists.thewrittenword.com> (tiny change)
2007-09-14 Peter O'Gorman <bug-gnu-emacs@mlists.thewrittenword.com> (tiny change)
* gtkutil.c (xg_get_file_with_chooser): Move GCPRO1 after declarations.
* termhooks.h (enum event_kind): Remove trailing comma.
@ -66,15 +72,15 @@
2007-09-02 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* keyboard.c: Qrtl is new.
(parse_tool_bar_item): Handle :rtl keyword.
(syms_of_keyboard): Intern :rtl keyword.
(parse_tool_bar_item): Handle :rtl keyword.
(syms_of_keyboard): Intern :rtl keyword.
* dispextern.h (enum tool_bar_item_idx): Add TOOL_BAR_ITEM_RTL_IMAGE.
* gtkutil.c: (file_for_image, find_rtl_image): New functions.
(xg_get_image_for_pixmap): Use file_for_image
(update_frame_tool_bar): If direction is RTL, use RTL image if
defined. Use Gtk stock images or named theme icons if defined.
* gtkutil.c (file_for_image, find_rtl_image): New functions.
(xg_get_image_for_pixmap): Use file_for_image
(update_frame_tool_bar): If direction is RTL, use RTL image if
defined. Use Gtk stock images or named theme icons if defined.
2007-08-29 Martin Rudalics <rudalics@gmx.at>

View file

@ -2547,10 +2547,10 @@ x_draw_glyph_string (s)
unsigned long dy = 0, h = 1;
if (s->face->overline_color_defaulted_p)
{
w32_fill_area (s->f, s->hdc, s->gc->foreground, s->x,
s->y + dy, s->background_width, h);
}
{
w32_fill_area (s->f, s->hdc, s->gc->foreground, s->x,
s->y + dy, s->background_width, h);
}
else
{
w32_fill_area (s->f, s->hdc, s->face->overline_color, s->x,
@ -2572,7 +2572,7 @@ x_draw_glyph_string (s)
}
else
{
w32_fill_area (s->f, s->hdc, s->face->underline_color, s->x,
w32_fill_area (s->f, s->hdc, s->face->strike_through_color, s->x,
s->y + dy, s->width, h);
}
}