[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 4e17e0b84ae 2/2: Followup changes for styled underline support
|
From: |
Eli Zaretskii |
|
Subject: |
master 4e17e0b84ae 2/2: Followup changes for styled underline support |
|
Date: |
Sat, 27 Apr 2024 05:10:30 -0400 (EDT) |
branch: master
commit 4e17e0b84ae1a52a6032c83592bf958a1e26dea5
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
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)
---
src/androidterm.c | 6 +++---
src/haikuterm.c | 6 +++---
src/nsterm.m | 6 +++---
src/pgtkterm.c | 6 +++---
src/w32term.c | 6 +++---
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/androidterm.c b/src/androidterm.c
index 5de7b6f4e14..f5173168785 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -4158,7 +4158,7 @@ android_draw_glyph_string (struct glyph_string *s)
/* Draw underline. */
if (s->face->underline)
{
- if (s->face->underline == FACE_UNDER_WAVE)
+ if (s->face->underline == FACE_UNDERLINE_WAVE)
{
if (s->face->underline_defaulted_p)
android_draw_underwave (s, decoration_width);
@@ -4171,13 +4171,13 @@ android_draw_glyph_string (struct glyph_string *s)
android_set_foreground (s->gc, xgcv.foreground);
}
}
- else if (s->face->underline == FACE_UNDER_LINE)
+ else if (s->face->underline == FACE_UNDERLINE_SINGLE)
{
unsigned long thickness, position;
int y;
if (s->prev
- && s->prev->face->underline == FACE_UNDER_LINE
+ && s->prev->face->underline == FACE_UNDERLINE_SINGLE
&& (s->prev->face->underline_at_descent_line_p
== s->face->underline_at_descent_line_p)
&& (s->prev->face->underline_pixels_above_descent_line
diff --git a/src/haikuterm.c b/src/haikuterm.c
index 135f99dbdcb..c3971bf6fe4 100644
--- a/src/haikuterm.c
+++ b/src/haikuterm.c
@@ -827,15 +827,15 @@ haiku_draw_text_decoration (struct glyph_string *s,
struct face *face,
else
BView_SetHighColor (view, face->foreground);
- if (face->underline == FACE_UNDER_WAVE)
+ if (face->underline == FACE_UNDERLINE_WAVE)
haiku_draw_underwave (s, width, x);
- else if (face->underline == FACE_UNDER_LINE)
+ else if (face->underline == FACE_UNDERLINE_SINGLE)
{
unsigned long thickness, position;
int y;
if (s->prev
- && s->prev->face->underline == FACE_UNDER_LINE
+ && s->prev->face->underline == FACE_UNDERLINE_SINGLE
&& (s->prev->face->underline_at_descent_line_p
== s->face->underline_at_descent_line_p)
&& (s->prev->face->underline_pixels_above_descent_line
diff --git a/src/nsterm.m b/src/nsterm.m
index faf9324402b..84d94b5be74 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3330,14 +3330,14 @@ ns_draw_text_decoration (struct glyph_string *s, struct
face *face,
/* Do underline. */
if (face->underline)
{
- if (s->face->underline == FACE_UNDER_WAVE)
+ if (s->face->underline == FACE_UNDERLINE_WAVE)
{
if (!face->underline_defaulted_p)
[[NSColor colorWithUnsignedLong:face->underline_color] set];
ns_draw_underwave (s, width, x);
}
- else if (s->face->underline == FACE_UNDER_LINE)
+ else if (s->face->underline == FACE_UNDERLINE_SINGLE)
{
NSRect r;
@@ -3345,7 +3345,7 @@ ns_draw_text_decoration (struct glyph_string *s, struct
face *face,
/* If the prev was underlined, match its appearance. */
if (s->prev
- && s->prev->face->underline == FACE_UNDER_LINE
+ && s->prev->face->underline == FACE_UNDERLINE_SINGLE
&& s->prev->underline_thickness > 0
&& (s->prev->face->underline_at_descent_line_p
== s->face->underline_at_descent_line_p)
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)
/* Draw underline. */
if (s->face->underline)
{
- if (s->face->underline == FACE_UNDER_WAVE)
+ if (s->face->underline == FACE_UNDERLINE_WAVE)
{
if (s->face->underline_defaulted_p)
pgtk_draw_underwave (s, s->xgcv.foreground);
else
pgtk_draw_underwave (s, s->face->underline_color);
}
- else if (s->face->underline == FACE_UNDER_LINE)
+ else if (s->face->underline == FACE_UNDERLINE_SINGLE)
{
unsigned long thickness, position;
int y;
if (s->prev
- && s->prev->face->underline == FACE_UNDER_LINE
+ && s->prev->face->underline == FACE_UNDERLINE_SINGLE
&& (s->prev->face->underline_at_descent_line_p
== s->face->underline_at_descent_line_p)
&& (s->prev->face->underline_pixels_above_descent_line
diff --git a/src/w32term.c b/src/w32term.c
index 7afd1303b4d..20ea346c8aa 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2641,7 +2641,7 @@ w32_draw_glyph_string (struct glyph_string *s)
/* Draw underline. */
if (s->face->underline)
{
- if (s->face->underline == FACE_UNDER_WAVE)
+ if (s->face->underline == FACE_UNDERLINE_WAVE)
{
COLORREF color;
@@ -2652,13 +2652,13 @@ w32_draw_glyph_string (struct glyph_string *s)
w32_draw_underwave (s, color);
}
- else if (s->face->underline == FACE_UNDER_LINE)
+ else if (s->face->underline == FACE_UNDERLINE_SINGLE)
{
unsigned long thickness, position;
int y;
if (s->prev
- && s->prev->face->underline == FACE_UNDER_LINE
+ && s->prev->face->underline == FACE_UNDERLINE_SINGLE
&& (s->prev->face->underline_at_descent_line_p
== s->face->underline_at_descent_line_p)
&& (s->prev->face->underline_pixels_above_descent_line