diff options
| author | Eli Zaretskii | 2024-04-27 12:07:53 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2024-04-27 12:07:53 +0300 |
| commit | 4e17e0b84ae1a52a6032c83592bf958a1e26dea5 (patch) | |
| tree | 37e907871379edca5419d974f69d7200af422b5b /src/pgtkterm.c | |
| parent | 9f589eb924085a4612f46728e8850073128a2e43 (diff) | |
| download | emacs-4e17e0b84ae1a52a6032c83592bf958a1e26dea5.tar.gz emacs-4e17e0b84ae1a52a6032c83592bf958a1e26dea5.zip | |
Followup changes for styled underline support
* src/nsterm.m (ns_draw_text_decoration):
* src/pgtkterm.c (pgtk_draw_glyph_string):
* src/haikuterm.c (haiku_draw_text_decoration):
* src/androidterm.c (android_draw_glyph_string):
* src/w32term.c (w32_draw_glyph_string): Use new FACE_UNDER*
constants. (Bug#62994)
Diffstat (limited to 'src/pgtkterm.c')
| -rw-r--r-- | src/pgtkterm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pgtkterm.c b/src/pgtkterm.c index 1ec6bfcda4e..e08e4b2b230 100644 --- a/src/pgtkterm.c +++ b/src/pgtkterm.c | |||
| @@ -2546,20 +2546,20 @@ pgtk_draw_glyph_string (struct glyph_string *s) | |||
| 2546 | /* Draw underline. */ | 2546 | /* Draw underline. */ |
| 2547 | if (s->face->underline) | 2547 | if (s->face->underline) |
| 2548 | { | 2548 | { |
| 2549 | if (s->face->underline == FACE_UNDER_WAVE) | 2549 | if (s->face->underline == FACE_UNDERLINE_WAVE) |
| 2550 | { | 2550 | { |
| 2551 | if (s->face->underline_defaulted_p) | 2551 | if (s->face->underline_defaulted_p) |
| 2552 | pgtk_draw_underwave (s, s->xgcv.foreground); | 2552 | pgtk_draw_underwave (s, s->xgcv.foreground); |
| 2553 | else | 2553 | else |
| 2554 | pgtk_draw_underwave (s, s->face->underline_color); | 2554 | pgtk_draw_underwave (s, s->face->underline_color); |
| 2555 | } | 2555 | } |
| 2556 | else if (s->face->underline == FACE_UNDER_LINE) | 2556 | else if (s->face->underline == FACE_UNDERLINE_SINGLE) |
| 2557 | { | 2557 | { |
| 2558 | unsigned long thickness, position; | 2558 | unsigned long thickness, position; |
| 2559 | int y; | 2559 | int y; |
| 2560 | 2560 | ||
| 2561 | if (s->prev | 2561 | if (s->prev |
| 2562 | && s->prev->face->underline == FACE_UNDER_LINE | 2562 | && s->prev->face->underline == FACE_UNDERLINE_SINGLE |
| 2563 | && (s->prev->face->underline_at_descent_line_p | 2563 | && (s->prev->face->underline_at_descent_line_p |
| 2564 | == s->face->underline_at_descent_line_p) | 2564 | == s->face->underline_at_descent_line_p) |
| 2565 | && (s->prev->face->underline_pixels_above_descent_line | 2565 | && (s->prev->face->underline_pixels_above_descent_line |