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

Timestamp:

2022-11-17T19:56:07Z (17 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

901b302

Parents:

5d62130

Message:

Implement text abbreviation

When rendering text, gfx_puttext can now abbreviate it with …
to fit within the specified width. Use on window captions.
Now Barber Pole can have a proper caption.

Note that now the caption is centered on the space between the left
edge and the buttons, instead on the entire title bar, so it
may look a little lopsided. It will look better once we put
something to the left side of the title bar.

File:

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

uspace/lib/gfxfont/src/text.c

@@ -183 +183 @@
         /* Adjust position for horizontal alignment */
         if (fmt->halign != gfx_halign_left) {
+                /* Compute text width */
                 width = gfx_text_width(fmt->font, str);
+                if (fmt->abbreviate && width > fmt->width)
+                        width = fmt->width;
+
                 switch (fmt->halign) {
                 case gfx_halign_center:
@@ -233 +237 @@
         gfx_coord2_t spos;
         gfx_rect_t rect;
+        gfx_coord_t width;
+        gfx_coord_t rmargin;
+        bool ellipsis;
         errno_t rc;
 
@@ -244 +251 @@
         if (rc != EOK)
                 return rc;
+
+        width = gfx_text_width(fmt->font, str);
+
+        if (fmt->abbreviate && width > fmt->width) {
+                /* Need to append ellipsis */
+                ellipsis = true;
+                rmargin = spos.x + fmt->width - gfx_text_width(fmt->font, "...");
+        } else {
+                ellipsis = false;
+                rmargin = spos.x + width;
+        }
 
         cpos = spos;
@@ -256 +274 @@
                 gfx_glyph_get_metrics(glyph, &gmetrics);
 
+                /* Stop if we would run over the right margin */
+                if (fmt->abbreviate && cpos.x + gmetrics.advance > rmargin)
+                        break;
+
                 rc = gfx_glyph_render(glyph, &cpos);
                 if (rc != EOK)
@@ -274 +296 @@
 
                 rc = gfx_fill_rect(fmt->font->typeface->gc, &rect);
+                if (rc != EOK)
+                        return rc;
+        }
+
+        /* Render ellipsis, if required */
+        if (ellipsis) {
+                rc = gfx_font_search_glyph(fmt->font, ".", &glyph, &stradv);
+                if (rc != EOK)
+                        return EOK;
+
+                gfx_glyph_get_metrics(glyph, &gmetrics);
+
+                rc = gfx_glyph_render(glyph, &cpos);
+                if (rc != EOK)
+                        return rc;
+
+                cpos.x += gmetrics.advance;
+
+                rc = gfx_glyph_render(glyph, &cpos);
+                if (rc != EOK)
+                        return rc;
+
+                cpos.x += gmetrics.advance;
+
+                rc = gfx_glyph_render(glyph, &cpos);
                 if (rc != EOK)
                         return rc;
@@ -376 +423 @@
         tfmt.valign = gfx_valign_baseline;
 
+        /* Remaining available width */
+        tfmt.width = fmt->width - (cpos->x - spos.x);
+
         *cfmt = tfmt;
 }
@@ -390 +440 @@
 {
         gfx_coord2_t spos;
+        gfx_coord_t width;
 
         gfx_text_start_pos(pos, fmt, str, &spos);
+        width = gfx_text_width(fmt->font, str);
+        if (fmt->abbreviate && width > fmt->width)
+                width = fmt->width;
 
         rect->p0.x = spos.x;
         rect->p0.y = spos.y - fmt->font->metrics.ascent;
-        rect->p1.x = spos.x + gfx_text_width(fmt->font, str);
+        rect->p1.x = spos.x + width;
         rect->p1.y = spos.y +  fmt->font->metrics.descent + 1;
 }