Changeset 5c27e77 in mainline for uspace/lib/gfxfont/src/text.c

Timestamp:

2022-03-06T22:37:06Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4583015

Parents:

af259da

Message:

Text underlining support

File:

• uspace/lib/gfxfont/src/text.c (modified) (4 diffs)

uspace/lib/gfxfont/src/text.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -229 +229 @@
 {
         gfx_glyph_metrics_t gmetrics;
+        gfx_font_metrics_t fmetrics;
         size_t stradv;
         const char *cp;
         gfx_glyph_t *glyph;
         gfx_coord2_t cpos;
+        gfx_coord2_t spos;
+        gfx_rect_t rect;
         errno_t rc;
 
-        gfx_text_start_pos(font, pos, fmt, str, &cpos);
+        gfx_text_start_pos(font, pos, fmt, str, &spos);
 
         /* Text mode */
         if ((font->finfo->props.flags & gff_text_mode) != 0)
-                return gfx_puttext_textmode(font, &cpos, fmt->color, str);
+                return gfx_puttext_textmode(font, &spos, fmt->color, str);
 
         rc = gfx_set_color(font->typeface->gc, fmt->color);
@@ -245 +248 @@
                 return rc;
 
+        cpos = spos;
         cp = str;
         while (*cp != '\0') {
@@ -261 +265 @@
                 cp += stradv;
                 cpos.x += gmetrics.advance;
+        }
+
+        /* Text underlining */
+        if (fmt->underline) {
+                gfx_font_get_metrics(font, &fmetrics);
+
+                rect.p0.x = spos.x;
+                rect.p0.y = spos.y + fmetrics.underline_y0;
+                rect.p1.x = cpos.x;
+                rect.p1.y = spos.y + fmetrics.underline_y1;
+
+                rc = gfx_fill_rect(font->typeface->gc, &rect);
+                if (rc != EOK)
+                        return rc;
         }